Merge "Handle merge mode in repeated project configs" into feature/zuulv3