Merge pull request #2044 from pradpnayak/CRM-13310

Merge pull request #2044 from pradpnayak/CRM-13310

CRM-13310 Verified via several manual tests. One API test is failing but I'm 99% sure the failure is a 'bug' in the test (which is checking for the old incorrect behavior when payment instrument is changed). I've asked Pradeep to investigate and fix the test.

1) api_v3_ContributionTest::testCreateUpdateContributionPaymentInstrument
Attribute 'from_financial_account_id' not present in actual array.

/Users/dgg/git/crm_v4.4/tests/phpunit/CiviTest/CiviUnitTestCase.php:586
/Users/dgg/git/crm_v4.4/tests/phpunit/CiviTest/CiviUnitTestCase.php:526
/Users/dgg/git/crm_v4.4/tests/phpunit/api/v3/ContributionTest.php:1506
/Users/dgg/git/crm_v4.4/tests/phpunit/api/v3/ContributionTest.php:898
/Users/dgg/git/crm_v4.4/tools/scripts/phpunit:75