ECMS-5528: Fix bugs related to CKEditor upgrade