Merge pull request #5810 from eileenmcnaughton/master

Refactorings on backoffice contribution & membership form

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

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

diff --cc CRM/Core/BAO/CustomField.php
Simple merge

diff --cc CRM/Member/BAO/Membership.php
Simple merge

diff --cc CRM/Member/Form/Membership.php
Simple merge