XCOMMONS-403: Upgrade to HTML Cleaner 2.5