Merge "Fix test_rerun_on_abort" into feature/zuulv3