MAGETWO-72469: Merge 2.2-develop into develop

Author: slavvka

dev/tests/integration/testsuite/Magento/Eav/Setup/EavSetupTest.php

@@ -66,7 +66,7 @@ public function addAttributeDataProvider()
      *
      * @dataProvider addAttributeThrowExceptionDataProvider
      * @expectedException \Magento\Framework\Exception\LocalizedException
-     * @expectedExceptionMessage An attribute code must not be less than 1 and more than 30 characters.
+     * @expectedExceptionMessage An attribute code must not be less than 1 and more than 60 characters.
      */
     public function testAddAttributeThrowException($attributeCode)
     {
@@ -86,7 +86,7 @@ public function addAttributeThrowExceptionDataProvider()
             [null],
             [''],
             [' '],
-            ['more_than_60_characters_more_than_more_than_60_characters'],
+            ['more_than_60_characters_more_than_more_than_60_characters_more'],
         ];
     }