-- fixed for CRM-12127, for api fixes
Merge pull request #211 from pradpnayak/CRM-12127

-- fixed for CRM-12127, for api fixes
-- Pradeep ran the failing tests locally with this fix. I will spot check run a few of the failing tests after merge.