CRM-14961 - Fix (mostly) for display on Merge screen. Still need to fix postProcess and convert contact_type.name to label.

----------------------------------------
* CRM-14961:
  https://issues.civicrm.org/jira/browse/CRM-14961
Merge pull request #3652 from davecivicrm/CRM-14961

CRM-14961 - Fix (mostly) for display on Merge screen. Still need to fix ...