Merge "De-template project-name in JJB"