[xwiki-notifications] [jira@xwiki.org][Issue] Updates for CRISTAL-212: Make embed less prone to conflicts