Merge branch '4.7.29-rc' of https://github.com/civicrm/civicrm-core into merge

Change-Id: I1565e0bf1c32956d29bb56107b3f3eb57485d1f9

diff --cc CRM/Contribute/BAO/Contribution.php
Simple merge

diff --cc CRM/Contribute/BAO/Contribution/Utils.php
Simple merge

diff --cc CRM/Contribute/Form/Contribution/Confirm.php
Simple merge

diff --cc CRM/Price/BAO/LineItem.php
Simple merge

diff --cc CRM/Utils/Rule.php
Simple merge

diff --cc tests/phpunit/CRM/Contribute/BAO/ContributionTest.php
Simple merge

diff --cc tests/phpunit/CRM/Member/Form/MembershipTest.php
Simple merge

diff --cc tests/phpunit/CiviTest/CiviUnitTestCase.php
Simple merge

diff --cc tests/phpunit/api/v3/ContributionTest.php
Simple merge