Make sure we set the provided shipment id from the payload received as the shipment number

Conflicts:
	lib/spree/wombat/handler/add_shipment_handler.rb
	spec/lib/spree/wombat/handler/add_shipment_handler_spec.rb