Product#stock_items should return stock_items for the master variant too

Fixes #3737

Conflicts:
	core/app/models/spree/product.rb