Merge "Only add BUILD_TIMEOUT if there is a timeout" into feature/zuulv3