Fix indexing issue and rewrite conflict with Multiwarehouse

@jonpday Can you please review and merge? Modified the rewrite for product_indexer_price_configurable to point to the right class.  Modified the price indexer to extend from multiwarehouse if installed and include the stock_id in the index
@aligentjim Given that this is only a small class, are you happy for me to keep it this way?