[xwiki-notifications] [[email protected]][Issue] Updates for XWIKI-17832: ExtensionIT#testUpgradeWithMergeConflict is flickering