Merge "Remove unused jjb job templates"