Merge "Update JJB yaml to build Champ as a microservice"