Add missing ckeditor plugins
Merging origin/john/master-pending-ckeditor-addplugins into master