-- CRM-13467 QA fixes
Merge pull request #1879 from ravishnair/CRM-13467QA

-- CRM-13467 QA fixes