[xwiki-notifications] [jira@xwiki.org][Issue] Updates for CONFLUENCE-295: Handle naming strategy collisions