CRM-13339 improvised changes

----------------------------------------
* CRM-13339: CRM_Core_PseudoConstant warnings
  http://issues.civicrm.org/jira/browse/CRM-13339
Merge pull request #1623 from monishdeb/CRM-13323

CRM-13323 improvised changes