CRM-12986 fix schema so required fields are required / not null