CRM-13981 QA fixes

----------------------------------------
* CRM-13981:
  http://issues.civicrm.org/jira/browse/CRM-13981
Merge pull request #2825 from monishdeb/CRM-13981

CRM-13981 QA fixes