Merge branch '2.7' into 2.8

* 2.7:
  [Console] Do not duplicate Helper::strlen() code
  [FrameworkBundle] Adding the extension XML
  [Form] Minor: Fix comment in ChoiceType
  [FrameworkBundle] AbstractConfigCommand: do not try registering bundles twice

Author: fabpot

Extension/Core/Type/ChoiceType.php

@@ -162,7 +162,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
         }
 
         // To avoid issues when the submitted choices are arrays (i.e. array to string conversions),
-        // we have to ensure that all elements of the submitted choice data are strings or null.
+        // we have to ensure that all elements of the submitted choice data are NULL, strings or ints.
         $builder->addEventListener(FormEvents::PRE_SUBMIT, function (FormEvent $event) {
             $data = $event->getData();