Merge remote-tracking branch 'origin/MAGETWO-70671' into BUGS-2.2

Author: slavvka

lib/internal/Magento/Framework/Session/SessionManager.php

@@ -199,12 +199,12 @@ public function start()
             // Need to apply the config options so they can be ready by session_start
             $this->initIniOptions();
             $this->registerSaveHandler();
-
+            $sid = $this->sidResolver->getSid($this);
             // potential custom logic for session id (ex. switching between hosts)
-            $this->setSessionId($this->sidResolver->getSid($this));
+            $this->setSessionId($sid);
             session_start();
             $this->validator->validate($this);
-            $this->renewCookie();
+            $this->renewCookie($sid);
 
             register_shutdown_function([$this, 'writeClose']);
 
@@ -218,15 +218,18 @@ public function start()
     /**
      * Renew session cookie to prolong session
      *
+     * @param null|string $sid If we have session id we need to use it instead of old cookie value
      * @return $this
      * @since 2.2.0
      */
-    private function renewCookie()
+    private function renewCookie($sid)
     {
         if (!$this->getCookieLifetime()) {
             return $this;
         }
-        $cookieValue = $this->cookieManager->getCookie($this->getName());
+        //When we renew cookie, we should aware, that any other session client do not
+        //change cookie too
+        $cookieValue = $sid ?: $this->cookieManager->getCookie($this->getName());
         if ($cookieValue) {
             $metadata = $this->cookieMetadataFactory->createPublicCookieMetadata();
             $metadata->setPath($this->sessionConfig->getCookiePath());