XCOMMONS-635: Upgrade to HTMLCleaner 2.9