Merge commit 'refs/pull/50/head' of https://github.com/magento/magento2ce into MAGETWO-38635-prs

Author: Joan He

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

@@ -881,8 +881,10 @@ public function performIdentityCheck($passwordString)
                 'result' => $isCheckSuccessful
             ]
         );
-        $this->reload();
-        if ($this->getLockExpires()) {
+        // Check if lock information has been updated in observers
+        $clonedUser = clone($this);
+        $clonedUser->reload();
+        if ($clonedUser->getLockExpires()) {
             throw new \Magento\Framework\Exception\State\UserLockedException(
                 __('Your account is temporarily disabled.')
             );