add missing options
Merge branch '2.3' into 2.4

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