Merge "Re-enable TestScheduler.test_rerun_on_error" into feature/zuulv3