XWIKI-10163: Unable to import a XAR generated by the Wiki Stream Confluence Importer

(cherry picked from commit 75a316a604f97ce8d600ae8e28b4365f8a3de170)

Conflicts:
	xwiki-platform-core/xwiki-platform-wikistream/xwiki-platform-wikistream-instance/xwiki-platform-wikistream-instance-extension/src/test/java/org/xwiki/wikistream/instance/internal/output/ExtensionInstanceOutputWikiStreamTest.java
	xwiki-platform-core/xwiki-platform-wikistream/xwiki-platform-wikistream-test/src/main/java/org/xwiki/wikistream/test/integration/WikiStreamTest.java