Merge pull request #6803 from eileenmcnaughton/CRM-11338-paypal-fee