CRM-15474 - Move js-based form alterations to php
CRM-15593 Prevent contributions being imported for is_deleted contacts
CRM-15578 - CRM_Core_Transaction - Add support for nested transactions; add tests.
CRM-15578 - APIv3 - options.force_rollback
Merge pull request #4551 from kenwest/CRM-15593

CRM-15593 Prevent contributions being imported for is_deleted contacts
CRM_Core_TransactionTest - Improve reporting of unplanned exceptions
CRM-15578, CRM-13523 - CiviUnitTestCase - Improve output for PEAR DB errors
CRM-15597 - Fix display of frozen custom contactRef fields
Merge pull request #4562 from colemanw/CRM-15597

CRM-15597 - Fix display of frozen custom contactRef fields
Merge pull request #4548 from totten/master-savepoints

CRM-15578 - CRM_Core_Transaction - Add support for nested transactions (savepoints)
Remove ancient upgrade scripts
Remove legacy code from CRM_Upgrade_Form
Merge pull request #4565 from colemanw/delOldUpgraders

Remove ancient upgrade scripts
Merge branch 'CRM-15474' of github.com:colemanw/civicrm-core into CRM-15527

Conflicts:
	templates/CRM/Event/Form/Participant.tpl

----------------------------------------
* CRM-15474: Event cart option js breaks "add participant" form
  https://issues.civicrm.org/jira/browse/CRM-15474
* CRM-15527: error in IPN relating to numRelatedMemberships
  https://issues.civicrm.org/jira/browse/CRM-15527
Fix for CRM-15564
Merge pull request #4570 from kurund/CRM-15527

CRM-15527
Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2014-11-17-13-40-23
Merge pull request #4569 from rohankatkar/CRM-15564

Fix for CRM-15564