CRM-15485
CRM-15418 - Prevent non-contact tokens from being lost in replaceGreetingTokens function.

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

CRM-15418 - Prevent non-contact tokens from being lost in replaceGreetin...
Merge pull request #4408 from jitendrapurohit/CRM-15485

CRM-15485