Merge branch '2.4' into 2.5

* 2.4:
  add missing options
  revert #11510, moved to 2.6
  [WebProfilerBundle] Fixed double height of canvas

Author: nicolas-grekas

Resources/translations/validators.nl.xlf

@@ -180,7 +180,7 @@
             </trans-unit>
             <trans-unit id="48">
                 <source>This value should have exactly {{ limit }} character.|This value should have exactly {{ limit }} characters.</source>
-                <target>Deze waarde moet exact {{ limit }} tekens lang zijn.</target>
+                <target>Deze waarde moet exact {{ limit }} teken lang zijn.|Deze waarde moet exact {{ limit }} tekens lang zijn.</target>
             </trans-unit>
             <trans-unit id="49">
                 <source>The file was only partially uploaded.</source>