Merge "Move CRD tests to test_gerrit_legacy_crd" into feature/zuulv3