ECMS-5528: Fix some problems on CKEditor upgrade