CRM-13344 - Revert commit 827659b2 schema changes from CRM-13161

----------------------------------------
* CRM-13344: Resolve test / schema issues around prefix_id, suffix_id, gender
  http://issues.civicrm.org/jira/browse/CRM-13344
* CRM-13161: Greetings are  not evaluated correctly if it includes prefix / suffix
  http://issues.civicrm.org/jira/browse/CRM-13161
CRM-13344 - Revert "Fix convertToPseudoNames for CRM-13318"

This reverts commit ffe16a66e691cdb6dcd889cde5778c7a9bca9c72.
CRM-13161 Add support for legacy tokens

----------------------------------------
* CRM-13161: Greetings are  not evaluated correctly if it includes prefix / suffix
  http://issues.civicrm.org/jira/browse/CRM-13161
CRM-13379 prevent double click on confirm button on main contribution page to prevent double payment or error
CRM-13379 fix prev commit - still include emailcommon.js in email form

----------------------------------------
* CRM-13379: Delete mailing from Archived, next page is Find Mailings
  http://issues.civicrm.org/jira/browse/CRM-13379
CRM-13379 fix merge bug
Merge pull request #1709 from colemanw/CRM-13344

Revert unique names and add legacy token support
Merge pull request #1645 from eileenmcnaughton/CRM-13379

CRM-13379 disable button on Contribution_Main form after click to prevent multiple submits
CRM-13344 Update search test

----------------------------------------
* CRM-13344: Resolve test / schema issues around prefix_id, suffix_id, gender
  http://issues.civicrm.org/jira/browse/CRM-13344