Merge branch '4.3' into 4.4

* 4.3:
  Remove Google references when not needed
  Simplify usage of dirname()
  Remove Google references when not needed

Author: fabpot

Tests/Dumper/PhpDumperTest.php

@@ -107,7 +107,7 @@ public function testDumpRelativeDir()
         $container->setParameter('foo', 'wiz'.\dirname(__DIR__));
         $container->setParameter('bar', __DIR__);
         $container->setParameter('baz', '%bar%/PhpDumperTest.php');
-        $container->setParameter('buz', \dirname(\dirname(__DIR__)));
+        $container->setParameter('buz', \dirname(__DIR__, 2));
         $container->compile();
 
         $dumper = new PhpDumper($container);