Merge branch 'PR2' of https://git.epam.com/MAGN-PASS/magento2ce into spm-131-PRs-stabilization

Author: Andrewb89

app/code/Magento/Security/composer.json

@@ -5,7 +5,6 @@
         "php": "~5.5.0|~5.6.0|~7.0.0",
         "magento/module-backend": "100.0.*",
         "magento/module-store": "100.0.*",
-        "magento/module-user": "100.0.*",
         "magento/framework": "100.0.*"
     },
     "suggest": {

app/code/Magento/User/Controller/Adminhtml/User/Role/SaveRole.php

@@ -46,11 +46,6 @@ class SaveRole extends \Magento\User\Controller\Adminhtml\User\Role
      */
     protected $securityCookieHelper;
 
-    /**
-     * @var \Magento\Backend\Model\Auth\Session
-     */
-    protected $backendAuthSession;
-
     /**
      * @param \Magento\Backend\App\Action\Context $context
      * @param \Magento\Framework\Registry $coreRegistry
@@ -60,7 +55,6 @@ class SaveRole extends \Magento\User\Controller\Adminhtml\User\Role
      * @param \Magento\Backend\Model\Auth\Session $authSession
      * @param \Magento\Framework\Filter\FilterManager $filterManager
      * @param \Magento\Security\Helper\SecurityCookie $securityCookieHelper
-     * @param \Magento\Backend\Model\Auth\Session $backendAuthSession
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -70,8 +64,7 @@ public function __construct(
         \Magento\Authorization\Model\RulesFactory $rulesFactory,
         \Magento\Backend\Model\Auth\Session $authSession,
         \Magento\Framework\Filter\FilterManager $filterManager,
-        \Magento\Security\Helper\SecurityCookie $securityCookieHelper,
-        \Magento\Backend\Model\Auth\Session $backendAuthSession
+        \Magento\Security\Helper\SecurityCookie $securityCookieHelper
     ) {
         parent::__construct(
             $context,
@@ -83,7 +76,6 @@ public function __construct(
             $filterManager
         );
         $this->securityCookieHelper = $securityCookieHelper;
-        $this->backendAuthSession = $backendAuthSession;
     }
 
     /**
@@ -166,7 +158,7 @@ protected function validateUser()
         $password = $this->getRequest()->getParam(
             \Magento\User\Block\Role\Tab\Info::IDENTITY_VERIFICATION_PASSWORD_FIELD
         );
-        $user = $this->backendAuthSession->getUser();
+        $user = $this->_authSession->getUser();
         $user->performIdentityCheck($password);
 
         return $this;

app/code/Magento/User/Model/User.php

@@ -26,6 +26,7 @@
  * @method string getExtra()
  * @method \Magento\User\Model\User setExtra(string $value)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
  * @SuppressWarnings(PHPMD.LongVariable)
  */
 class User extends AbstractModel implements StorageInterface, UserInterface