Reorder short circuit evaluation of Estimator#shipping_methods

Conflicts:
	core/app/models/spree/stock/estimator.rb