Feature/istwcms 5975 ebremner ckeditor fixes

Merged Eric Bremner requested to merge feature/ISTWCMS-5975-ebremner-ckeditor-fixes into 1.0.x

Merge request reports