Merge branch '3.3' into 3.4

* 3.3:
  remove useless comment
  fix merge

Author: nicolas-grekas

src/Symfony/Bundle/FrameworkBundle/HttpCache/HttpCache.php

@@ -54,7 +54,7 @@ public function __construct(HttpKernelInterface $kernel, $cacheDir = null)
     protected function forward(Request $request, $raw = false, Response $entry = null)
     {
         $this->getKernel()->boot();
-        $this->getKernel()->getContainer()->set('cache', $this); // to be removed in 4.0?
+        $this->getKernel()->getContainer()->set('cache', $this);
 
         return parent::forward($request, $raw, $entry);
     }

src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php

@@ -1618,10 +1618,6 @@ private function getServiceCall($id, Reference $reference = null)
         } elseif (null !== $reference && ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE !== $reference->getInvalidBehavior()) {
             $code = sprintf('$this->get(\'%s\', ContainerInterface::NULL_ON_INVALID_REFERENCE)', $id);
         } else {
-            if ($this->container->hasAlias($id)) {
-                $id = (string) $this->container->getAlias($id);
-            }
-
             $code = sprintf('$this->get(\'%s\')', $id);
         }