Merge "Fully qualify project configuration names" into feature/zuulv3