Merge "Read layout from BuildSet in first merge scenario" into feature/zuulv3