Move the fix from 2-1-stable into the 2-2-stable branch
Fix the Braintree capture method to comply with Spree 2-2 conventions. Fix the Rspec test.