Merge remote-tracking branch 'origin/MAGETWO-58917' into pr-2.0

Author: Sergey Shvets

app/code/Magento/Catalog/Model/ResourceModel/Product/Collection.php

@@ -2078,12 +2078,9 @@ public function addTierPriceData()
 
         /** @var $attribute \Magento\Catalog\Model\ResourceModel\Eav\Attribute */
         $attribute = $this->getAttribute('tier_price');
-        if ($attribute->isScopeGlobal()) {
-            $websiteId = 0;
-        } else {
-            if ($this->getStoreId()) {
-                $websiteId = $this->_storeManager->getStore($this->getStoreId())->getWebsiteId();
-            }
+        $websiteId = 0;
+        if ($attribute->isScopeWebsite() && $this->getStoreId() != 0) {
+            $websiteId = $this->_storeManager->getStore($this->getStoreId())->getWebsiteId();
         }
 
         $connection = $this->getConnection();