Merge branch '2.3' into 2.7

Conflicts:
	src/Symfony/Component/Form/Tests/FormFactoryTest.php
	src/Symfony/Component/HttpKernel/Kernel.php

Author: Tobion

Tests/Extension/Core/DataMapper/PropertyPathMapperTest.php

@@ -77,14 +77,6 @@ private function getForm(FormConfigInterface $config, $synchronized = true, $sub
         return $form;
     }
 
-    /**
-     * @return \PHPUnit_Framework_MockObject_MockObject
-     */
-    private function getDataMapper()
-    {
-        return $this->getMock('Symfony\Component\Form\DataMapperInterface');
-    }
-
     public function testMapDataToFormsPassesObjectRefIfByReference()
     {
         $car = new \stdClass();

Tests/FormFactoryTest.php

@@ -616,9 +616,4 @@ private function getMockResolvedType()
     {
         return $this->getMock('Symfony\Component\Form\ResolvedFormTypeInterface');
     }
-
-    private function getMockType()
-    {
-        return $this->getMock('Symfony\Component\Form\FormTypeInterface');
-    }
 }