Really fix shipment number generation

Fixes #4063

(really)

Conflicts:
	core/app/models/spree/shipment.rb
	core/spec/models/spree/shipment_spec.rb