CRM-14367 make pdf option dependent on site setting
Merge pull request #3135 from eileenmcnaughton/CRM-14367-pdf-option

CRM-14367 make pdf option dependent on site setting
CRM-14367 - Prevent notice by adding display_name to $returnProperties. Also remove unintentionally committed debug line in CRM/Mailing/Form/Settings.php

----------------------------------------
* CRM-14367:
  https://issues.civicrm.org/jira/browse/CRM-14367
Merge pull request #3184 from davecivicrm/CRM-14367a

CRM-14367 - Prevent notice by adding display_name to $returnProperties. ...