[Test] Update form factory bootstrap
Merge branch '2.0'

Conflicts:
	Tests/Form/Type/CKEditorTypeTest.php