[FrameworkBundle] Merged multiple line input into one line to fix the tests.

This was initially done in b85577bb9608008ffbe92586046cbaff76c2717e, but
reverted when merging and solving conflicts from 2.3 branch
(07de76122b09fd5a9837222f9346b7794df000b2).
Merge branch '2.4'

* 2.4:
  fixed CS
  allow the TextAreaFormField to be used with valid/invalid HTML
  Create security.id.xlf
  [DependencyInjection] Remove unneeded file
  [Twig] removed obsolete conditions on Twig versions
  added lines to exceptions for the trans and transchoice tags
  [FrameworkBundle] Merged multiple line input into one line to fix the tests.
  [Form] Make FormInterface::add docblock more explicit
  [Security] Add zh_CN translations
  Routing condition bugfix
  [Validator][Translation]update zh_CN translations
  [Validator] Minor fix in XmlLoader