fatal error fixes due to bad merge CRM-14276

----------------------------------------
* CRM-14276: Hook for display name
  https://issues.civicrm.org/jira/browse/CRM-14276
Merge pull request #2987 from kurund/CRM-14276

fatal error fixes due to bad merge CRM-14276