Merge "Stop double-logging the build id" into feature/zuulv3