Account for current_order returning 'nil' in OrdersController#update

Fixes #2750

Conflicts:
	core/config/locales/en.yml
	core/spec/controllers/spree/orders_controller_spec.rb