Merge "Use 'org/project' for tests which only operate on one project" into feature/zuulv3