NEMO-3307: fix n+1 on product listing for default_price and variants_including_master. Specs pass. Reviewed with @alanlo.