CRM-15418 - Prevent non-contact tokens from being lost in replaceGreetin...

...gTokens function.

----------------------------------------
* CRM-15418:
  https://issues.civicrm.org/jira/browse/CRM-15418