Merge branch '4.4' into 5.1

* 4.4:
  [FrameworkBundle] fix tests

Author: fabpot

Tests/DependencyInjection/FrameworkExtensionTest.php

@@ -1370,7 +1370,6 @@ public function testHttpClientOverrideDefaultOptions()
         $this->assertSame('http://example.com', $container->getDefinition('foo')->getArgument(1));
 
         $expected = [
-            'base_uri' => 'http://example.com',
             'headers' => [
                 'bar' => 'baz',
             ],