Merge "Fix race in test_crd_gate_unknown" into feature/zuulv3