Crm 12768 fix custom field option group handling

One to pull once the other tests are passing :-)