Merge branch 'hotfix/braintree_complete_on_authorize'
Paypal cancellation enhancements
Merge branch 'hotfix/paypal_cancellation_enhancements' into develop