Merge "Enable test_two_failed_changes_at_head test" into feature/zuulv3