Merge "Resolve project_name/project confusion for gerrit" into feature/zuulv3