Merge "Abort reconfiguration when cat jobs fail" into feature/zuulv3