Merge "Avoid multiple build cancelations" into feature/zuulv3