Merge branch '2.0' into 2-0-8-backlog

Author: magento-services-vantiv-deploy

app/code/Magento/Catalog/Controller/Adminhtml/Product/SuggestAttributeSets.php

@@ -46,4 +46,12 @@ public function execute()
         );
         return $resultJson;
     }
+
+    /**
+     * @return bool
+     */
+    protected function _isAllowed()
+    {
+        return $this->_authorization->isAllowed('Magento_Catalog::products');
+    }
 }

app/code/Magento/Catalog/Controller/Adminhtml/Product/SuggestAttributes.php

@@ -50,4 +50,12 @@ public function execute()
         );
         return $resultJson;
     }
+
+    /**
+     * @return bool
+     */
+    protected function _isAllowed()
+    {
+        return $this->_authorization->isAllowed('Magento_Catalog::products');
+    }
 }

dev/tests/integration/testsuite/Magento/Test/Integrity/Modular/_files/skip_blocks_ce.php

@@ -15,8 +15,16 @@
     'Magento\Config\Block\System\Config\Form',
     'Magento\Config\Block\System\Config\Tabs',
     'Magento\Review\Block\Form',
+    'Magento\Braintree\Block\Form',
+    'Magento\Braintree\Block\Payment',
     // Fails because of dependence on registry
     'Magento\Reminder\Block\Adminhtml\Reminder\Edit\Tab\Customers',
     'Magento\LayeredNavigation\Block\Navigation',
     'Magento\LayeredNavigation\Block\Navigation\State',
+    // Other failures
+    'Magento\ProductAlert\Block\Email\Price',
+    'Magento\ProductAlert\Block\Email\Stock',
+    'Magento\ProductAlert\Block\Product\View',
+    'Magento\ProductAlert\Block\Product\View\Price',
+    'Magento\ProductAlert\Block\Product\View\Stock'
 ];