CRM-14951: no of terms should be calculated on contribution id rather than entity id/table
CRM-14995 contributions disappearing on pledge edit

Conflicts:
	CRM/Pledge/Form/Pledge.php
CRM-14995 tidyups
CRM-14983 - Sunning Contribution via Search Builder Fails Putting Contacts in Smart Group

https://issues.civicrm.org/jira/browse/CRM-14983
CRM-15002: fix broken Link Case functionality
CRM-15021 fix - Reenabling 'Allow other amounts' on contribution page leaves field inactive

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

CRM-15021 fix - Reenabling 'Allow other amounts' on contribution page le...
Merge pull request #3713 from yashodha/CRM-15002

CRM-15002: fix broken Link Case functionality
CRM-15002: fix case id in subject
Civi\CCase\SequenceListenerTest - Reduce timing sensitivity
CRM-15027- fix copy function for date fields
CRM-15023 - Fix regression in CRM_Core_Permission_GenericTest

Follow-up to 29f6fbb7c
Merge pull request #3720 from yashodha/CRM-15027

CRM-15027- fix copy function for date fields
Merge pull request #3722 from totten/master-perm-regr

CRM-15023 - Fix regression in CRM_Core_Permission_GenericTest
Merge pull request #3721 from totten/master-seqtest

Civi\CCase\SequenceListenerTest - Reduce timing sensitivity
Merge pull request #3719 from yashodha/CRM-15002

CRM-15002: fix case id in subject
INFRA-124 - civicrm.settings.php - Softer define()s

INFRA-124 will require that we make some defines (e.g. CIVICRM_DSN) dynamic
when running multiple test processes.  This patch allows us to
inject/override those settings without fully parsing/understanding the
content of civicrm.settings.php.
INFRA-124 - CiviSeleniumTestCase - Load cookies from $this->settings->cookies

For INFRA-124, we'll need a way to distinguish requests that correspond to
different test-instances.  We'll do that by passing along a cookie.
Merge pull request #3679 from yashodha/CRM-14951

Tested, working fine.
Fix for CRM-15026