Merge branch 'PR2' into 'spm-131-PRs-stabilization'

Pr2

See merge request !167

Author: Vadim Zubovich

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

@@ -118,7 +118,7 @@ public function upgrade(ModuleDataSetupInterface $setup, ModuleContextInterface
         if (version_compare($context->getVersion(), '2.0.3') < 0) {
             /** @var \Magento\Catalog\Setup\CategorySetup $categorySetup */
             $categorySetup = $this->categorySetupFactory->create(['setup' => $setup]);
-            $categorySetup->updateAttribute(3, 51, 'default_value', 1);
+            $categorySetup->updateAttribute(3, 54, 'default_value', 1);
         }
 
         if (version_compare($context->getVersion(), '2.0.4') < 0) {

app/code/Magento/Integration/Controller/Adminhtml/Integration/Save.php

@@ -133,12 +133,12 @@ protected function getIntegration($integrationId)
         } catch (IntegrationException $e) {
             $this->messageManager->addError($this->escaper->escapeHtml($e->getMessage()));
             $this->_redirect('*/*/');
-            return;
+            return null;
         } catch (\Exception $e) {
             $this->_logger->critical($e);
             $this->messageManager->addError(__('Internal error. Check exception log for details.'));
             $this->_redirect('*/*');
-            return;
+            return null;
         }
 
         return $integrationData;

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

@@ -10,7 +10,6 @@
         <sequence>
             <module name="Magento_Backend"/>
             <module name="Magento_Store"/>
-            <module name="Magento_User"/>
         </sequence>
     </module>
 </config>