Merge "Add multi-branch support for project-templates" into feature/zuulv3