Merge "Ignore duplicate project-template definitions" into feature/zuulv3