NXP-16240: fformat + cleanup
NXP-16240: fix image upload in tinymce, migrating code to use JSF2 h:inputText tag instead of s:fileUpload