Fixes New Braintree Cancel Method

Fixes #152
Merge branch '2-2-stable' into 1838