Merge "Fix race in test_queue_rate_limiting_dependent" into feature/zuulv3