Merge "Refactor jjb ci templates"