Merge "Re-enable test_rerun_on_abort" into feature/zuulv3