Merge "Fix race in CRD duplicates test"