Load a StockItem's variant, even if it's been soft deleted

Alternative patch for #4652

Fixes #4651
Fixes #4652

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