Merge branch '6.1' into 6.2

* 6.1:
  [HttpKernel] fix merge
  [HttpKernel] fix merge
  Revert "bug #48089 [Console] Fix clear line with question in section (maxbeckers)"

Author: nicolas-grekas

Tests/DependencyInjection/WebProfilerExtensionTest.php

@@ -33,8 +33,12 @@ class WebProfilerExtensionTest extends TestCase
 
     public static function assertSaneContainer(Container $container)
     {
+        $removedIds = $container->getRemovedIds();
         $errors = [];
         foreach ($container->getServiceIds() as $id) {
+            if (isset($removedIds[$id])) {
+                continue;
+            }
             try {
                 $container->get($id);
             } catch (\Exception $e) {