CRM-14800 fix - Contact merge deletes a contribution record if it is linked to a membership being merged

https://issues.civicrm.org/jira/browse/CRM-14800
Merge pull request #3447 from monishdeb/CRM-14800

CRM-14800 fix - Contact merge deletes a contribution record if it is linked to a membership being merged
CRM-14817 - Core CiviCRM - Relationship field mapping option disappear

----------------------------------------
* CRM-14817: Relationship field mapping option disappear after select more field
  https://issues.civicrm.org/jira/browse/CRM-14817