Merge "Fix scheduler reconfiguration handler" into feature/zuulv3