Merge "Remove layout.projects" into feature/zuulv3