TINY-5941 fixed conflict with current changelog
TINY-5941 fixed conflict with current changelog

tinymce/tinymce,tinymce/tinymce,TeamupCom/tinymce,FernCreek/tinymce,tinymce/tinymce,FernCreek/tinymce,FernCreek/tinymce,TeamupCom/tinymce