Make 'Card has expired' error message translateable
Add spree/credit_card.base translation

This is necessary due it to being used in API responses when the payment step fails in CheckoutsController
[api] Resolve orders issue where user_id was always null when updating order

Fixes #3369
Fixes #3378

Conflicts:
	api/app/models/spree/order_decorator.rb
	api/spec/controllers/spree/api/orders_controller_spec.rb
Clean up RSpec deprecation warnings wrt 'should_not raise_error(SpecificError)'
Correct reference to Spree::Core::ProductFilters inside product_filter_spec
[sample] Move line items creation into orders.rb, ensuring that orders have shipments created before they transition into complete