[xwiki-notifications] [jira@xwiki.org][Issue] Updates for XWIKI-21626: XSS through conflict resolution