Merge "Handle unknown project-template error" into feature/zuulv3