Manually merging in #1782: Allow ckeditor config override via contenttype HTML