After merge fixes - brought back changes made to ckeditor_config.js on master between e2eb07263 and 735db76.