Merge "Add tests for Sanitizer::escapeHtmlAllowEntities"