CRM-13161 change token names back to the familiar old ones

----------------------------------------
* CRM-13161: Greetings are  not evaluated correctly if it includes prefix / suffix
  http://issues.civicrm.org/jira/browse/CRM-13161
CRM-10128 - fix to address core fields like nickname, middle name, first, last, gender, current employer, prefix, suffix
Merge pull request #1714 from deepak-srivastava/profile

CRM-10128 - fix to address core fields like nickname, middle name, first...
Merge pull request #1711 from colemanw/master

CRM-13161 change token names back to the familiar old ones
Update Detail.php

Fixed missing space in soft credit stats.
CRM-13344 - Update search builder and other code for pseudoconstant fields

----------------------------------------
* CRM-13344: Resolve test / schema issues around prefix_id, suffix_id, gender
  http://issues.civicrm.org/jira/browse/CRM-13344
Merge pull request #1717 from colemanw/master

CRM-13344 - Update search builder and other code for pseudoconstant fields