Order#adjustment_total really means discount total.

Conflicts:
	spec/serializers/spree/hub/order_serializer_spec.rb
Merge branch '2-3-stable' of https://github.com/spree/spree_wombat into 2-3-stable