Merge branch 'MAGETWO-47025' of github.corp.magento.com:magento-troll/magento2ce into MAGETWO-51814

Author: slopukhov

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

@@ -338,7 +338,20 @@ public function upgrade(ModuleDataSetupInterface $setup, ModuleContextInterface
                 ]
             );
         }
+        
+        if (version_compare($context->getVersion(), '2.0.7') < 0) {
+            /** @var EavSetup $eavSetupF */
+            $eavSetup= $this->eavSetupFactory->create(['setup' => $setup]);
 
+            $eavSetup->updateAttribute(
+                ProductAttributeInterface::ENTITY_TYPE_CODE,
+                'meta_description',
+                [
+                    'note' => 'Maximum 255 chars. Meta Description should optimally be between 150-160 characters'
+                ]
+            );
+        }
+        
         $setup->endSetup();
     }
 }

app/code/Magento/Catalog/etc/module.xml

@@ -6,7 +6,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_Catalog" setup_version="2.0.6">
+    <module name="Magento_Catalog" setup_version="2.0.7">
         <sequence>
             <module name="Magento_Eav"/>
             <module name="Magento_Cms"/>

app/code/Magento/Eav/Setup/EavSetup.php

@@ -909,7 +909,7 @@ public function addAttributeOption($option)
      *
      * @param int|string $entityTypeId
      * @param int|string $id
-     * @param string $field
+     * @param string|array $field
      * @param mixed $value
      * @param int $sortOrder
      * @return $this