Merge branch 'MAGETWO-93990' into mpi-PR-2008

Author: Mariana Lashch

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

@@ -818,6 +818,7 @@ protected function doAddWebsiteNamesToResult()
         foreach ($this as $product) {
             if (isset($productWebsites[$product->getId()])) {
                 $product->setData('websites', $productWebsites[$product->getId()]);
+                $product->setData('website_ids', $productWebsites[$product->getId()]);
             }
         }
         return $this;

app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav.php

@@ -909,6 +909,9 @@ private function canDisplayUseDefault(ProductAttributeInterface $attribute)
         $attributeCode = $attribute->getAttributeCode();
         /** @var Product $product */
         $product = $this->locator->getProduct();
+        if ($product->isLockedAttribute($attributeCode)) {
+            return false;
+        }
 
         if (isset($this->canDisplayUseDefault[$attributeCode])) {
             return $this->canDisplayUseDefault[$attributeCode];