Merge pull request #4900 from reinaris/patch-3

adjustment_state (icon) returns 'fa fa-lock'
Update shipment in proper chronological order

Every time the selected shipping rate has changed as a shipment cost
change should be propagated through order totals and states

About #4845

Conflicts:
	api/app/controllers/spree/api/shipments_controller.rb