Merge pull request #5953 from eileenmcnaughton/CRM-16555-4

Crm 16555 4

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

diff --cc CRM/Core/Payment.php
Simple merge

diff --cc CRM/Core/Payment/PayPalImpl.php
Simple merge

diff --cc templates/CRM/Contribute/Form/Contribution/Main.tpl
Simple merge

diff --cc templates/CRM/Event/Form/Registration/Register.tpl
Simple merge