always return the master variant in the variants key when serializing products

Conflicts:
	spec/serializers/spree/wombat/product_serializer_spec.rb
fix failing spec after cherry-picking