Merge branch '5.4' into 6.0

* 5.4:
  fix merge
  Fix non-existent parameter in test.session.listener

Author: nicolas-grekas

DependencyInjection/FrameworkExtension.php

@@ -325,9 +325,8 @@ public function load(array $configs, ContainerBuilder $container)
 
             $this->sessionConfigEnabled = true;
             $this->registerSessionConfiguration($config['session'], $container, $loader);
-            if (!empty($config['test'])) {
-                $container->getDefinition('test.session.listener')->setArgument(2, '%session.storage.options%');
-            }
+        } elseif (!empty($config['test'])) {
+            $container->removeDefinition('test.session.listener');
         }
 
         if ($this->isConfigEnabled($container, $config['request'])) {