#10208: Merge branch 'develop' of github.com:magento/magento2 into JeroenVanLeusden-patch-1

Author: ishakhsuvarov

app/code/Magento/Eav/Model/Entity/Attribute.php

@@ -23,7 +23,7 @@ class Attribute extends \Magento\Eav\Model\Entity\Attribute\AbstractAttribute im
     /**
      * Attribute code max length
      */
-    const ATTRIBUTE_CODE_MAX_LENGTH = 30;
+    const ATTRIBUTE_CODE_MAX_LENGTH = 255;
 
     /**
      * Cache tag

lib/internal/Magento/Framework/Model/ResourceModel/AbstractResource.php

@@ -91,7 +91,7 @@ public function commit()
                     call_user_func($callback);
                 }
             } catch (\Exception $e) {
-                throw $e;
+                $this->logger->critical($e);
             }
         }
         return $this;