Merge remote-tracking branch 'origin/2.3' into 2.3

Author: weaverryan

cookbook/form/inherit_data_option.rst

@@ -48,9 +48,6 @@ Let's build two forms for these entities, ``CompanyType`` and ``CustomerType``::
 
     // src/Acme/HelloBundle/Form/Type/CompanyType.php
     namespace Acme\HelloBundle\Form\Type;
-    
-    use Symfony\Component\Form\AbstractType;
-    use Symfony\Component\Form\FormBuilder;
 
     use Symfony\Component\Form\AbstractType;
     use Symfony\Component\Form\FormBuilderInterface;