Merge "Re-enable remaining test_crd_check_* tests" into feature/zuulv3