Merge "Fix broken project config in dynamic config test" into feature/zuulv3