CRM-13965-qa-fixes
Merge pull request #2642 from pratik-joshi/CRM-13965-qa-fixes

CRM-13965-qa-fixes