Backport to v2.x: * https://github.com/solidusio/solidus_braintree/pull/116 * https://github.com/solidusio/solidus_braintree/pull/129