25299 ckeditor wysiwyg

Rerolling the last PR for this, as a branch change closed it...