See CMS-9731
CMS-9854 Upgraded HtmlCleaner seems to incorrectly html encode text
CMS-9731 update HtmlCleaner to 2.16