Merge remote-tracking branch 'falcons/MAGETWO-62560' into MAGETWO-65701

Author: Bohdan Korablov

app/code/Magento/Catalog/Setup/UpgradeData.php

@@ -372,13 +372,14 @@ private function changePriceAttributeDefaultScope($categorySetup)
         $entityTypeId = $categorySetup->getEntityTypeId(\Magento\Catalog\Model\Product::ENTITY);
         foreach (['price', 'cost', 'special_price'] as $attributeCode) {
             $attribute = $categorySetup->getAttribute($entityTypeId, $attributeCode);
-            $categorySetup->updateAttribute(
-                $entityTypeId,
-                $attribute['attribute_id'],
-                'is_global',
-                \Magento\Eav\Model\Entity\Attribute\ScopedAttributeInterface::SCOPE_GLOBAL
-            );
-
+            if (isset($attribute['attribute_id'])) {
+                $categorySetup->updateAttribute(
+                    $entityTypeId,
+                    $attribute['attribute_id'],
+                    'is_global',
+                    \Magento\Eav\Model\Entity\Attribute\ScopedAttributeInterface::SCOPE_GLOBAL
+                );
+            }
         }
     }
 }