CRM-12274
api fixes
Merge pull request #516 from yashodha/activity-migration

Activity migration