Merge "Fix race condition in test_success_url" into feature/zuulv3