Fixing editor configuration. See #5875
Minor - fixing PHP warnings.
Fixing ckeditor templates see #6173