Maunual patching for issues #2616 #2570 #2678 #2585 #2652

	modified:   core/app/models/spree/gateway.rb
	modified:   core/app/models/spree/payment.rb
	modified:   core/app/models/spree/payment/processing.rb
	modified:   core/app/models/spree/payment_method.rb
	modified:   core/spec/models/payment_spec.rb