XWIKI-9587: Never delete pages that have user modifications in them
Merge branch 'master' into feature-deleteconflict
Merge branch 'master' into feature-deleteconflict
XWIKI-9587: Never delete pages that have user modifications in them
Merge branch 'master' into feature-deleteconflict
XWIKI-9587: Never delete pages that have user modifications in them
XWIKI-9587: Never delete pages that have user modifications in them
XWIKI-9783: WikiStream XAR parser fail to parse class with property named "name"
XWIKI-9784: WikiStream XAR parser fail to parse document without <locale> element
XWIKI-9587: Never delete pages that have user modifications in them
Merge branch 'master' into feature-deleteconflict

Conflicts:
	xwiki-platform-core/xwiki-platform-wikistream/xwiki-platform-wikistream-streams/xwiki-platform-wikistream-stream-xar/src/test/resources/xar/document/document3.test
XWIKI-9120: Extension Manager shouldn't add new versions of attachments when no changes have been made to the document
XWIKI-9120: Extension Manager shouldn't add new versions of attachments when no changes have been made to the document
XWIKI-9587: Never delete pages that have user modifications in them
Merge branch 'master' into feature-deleteconflict
XWIKI-9587: Never delete pages that have user modifications in them
Merge branch 'feature-deleteconflict'