worked on CRM-12964, more schema changes / data fixes