Merge branch '2.6' into 2.7

* 2.6:
  [Form] fixed form tests when using 2.7 deps
  [TwigBridge] Fix bootstrap rendering when user explicitly use form_label
  Fixed HtmlDumper with long string

Conflicts:
	src/Symfony/Component/Form/Tests/Extension/Validator/Constraints/FormValidatorTest.php

Author: fabpot

Tests/Extension/Validator/Constraints/FormValidatorTest.php

@@ -18,6 +18,7 @@
 use Symfony\Component\Form\Extension\Validator\Constraints\Form;
 use Symfony\Component\Form\Extension\Validator\Constraints\FormValidator;
 use Symfony\Component\Form\SubmitButtonBuilder;
+use Symfony\Component\Validator\Context\ExecutionContextInterface;
 use Symfony\Component\Validator\Constraints\NotNull;
 use Symfony\Component\Validator\Constraints\NotBlank;
 use Symfony\Component\Validator\Tests\Constraints\AbstractConstraintValidatorTest;