Merge "Protect against builds dict changing while we iterate" into feature/zuulv3