Merge "Serve keys from canonical project name" into feature/zuulv3