Merge "Re-enable test_queue_rate_limiting" into feature/zuulv3