Merge "Re-enable test_merge_failure_reporters" into feature/zuulv3