Merge "Revert "Migrate cicn job templates to global-jjb""