XCOMMONS-559: Upgrade to htmlcleaner 2.8