CRM-15701 QA-fixes
Merge pull request #2 from manishmore/QA-fixes

CRM-15701 QA-fixes