Merge branch '5.1' into 5.x

Author: derrabus

EventListener/AbstractSessionListener.php

@@ -58,12 +58,8 @@ public function onKernelRequest(RequestEvent $event)
 
         $session = null;
         $request = $event->getRequest();
-        if ($request->hasSession()) {
-            // no-op
-        } elseif (method_exists($request, 'setSessionFactory')) {
+        if (!$request->hasSession()) {
             $request->setSessionFactory(function () { return $this->getSession(); });
-        } elseif ($session = $this->getSession()) {
-            $request->setSession($session);
         }
 
         $session = $session ?? ($this->container && $this->container->has('initialized_session') ? $this->container->get('initialized_session') : null);