Fix optimistic lock to not revert incremented version.

Conflicts:
	frontend/spec/controllers/spree/checkout_controller_spec.rb
	frontend/spec/controllers/spree/checkout_controller_with_views_spec.rb