Merge branch 'merchant_beta' of https://github.corp.magento.com/magento-sparta/magento2ce into MDVA-33

Author: isitnikov

app/code/Magento/CatalogInventory/Model/StockRegistryProvider.php

@@ -148,7 +148,6 @@ public function getStockItem($productId, $websiteId)
         if (!isset($this->stockItems[$key])) {
             $criteria = $this->stockItemCriteriaFactory->create();
             $criteria->setProductsFilter($productId);
-            $criteria->setWebsiteFilter($websiteId);
             $collection = $this->stockItemRepository->getList($criteria);
             $stockItem = current($collection->getItems());
             if ($stockItem && $stockItem->getItemId()) {

app/code/Magento/CatalogInventory/Test/Unit/Model/Spi/StockRegistryProviderTest.php

@@ -253,7 +253,6 @@ public function testGetStock()
     public function testGetStockItem()
     {
         $this->stockItemCriteriaFactory->expects($this->once())->method('create')->willReturn($this->stockItemCriteria);
-        $this->stockItemCriteria->expects($this->once())->method('setWebsiteFilter')->willReturn(null);
         $this->stockItemCriteria->expects($this->once())->method('setProductsFilter')->willReturn(null);
         $stockItemCollection = $this->getMock(
             '\Magento\CatalogInventory\Model\Resource\Stock\Item\Collection',