Mailing Labels - CRM-13396 - use addressee_display when possible when combining mailing addresses

----------------------------------------
* CRM-13396: Prefix missing in Mailing Labels when 'Merge labels for contacts with the same address' checked
  http://issues.civicrm.org/jira/browse/CRM-13396
Merge pull request #1641 from PalanteJon/CRM-13396

Mailing Labels - CRM-13396 - use addressee_display when possible when co...