Merge "Do not add implied branch matchers in project-templates" into feature/zuulv3