worked on CRM-12964, more schema changes / data fixes
Merge pull request #1095 from kurund/CRM-12964

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