Allow a shipment to transition to shipped when its order is canceled

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

cherry-picked from 4f632c012e250094dc00e83f251768a5b59de6fc in spree master