XWIKI-9587: Never delete pages that have user modifications in them
Merge branch 'master' into feature-deleteconflict
Merge branch 'master' into feature-deleteconflict
XWIKI-9740 : Categories field updates (check / uncheck) are not taken into account after adding a new category when editing a blog post
Merge branch 'master' of https://github.com/xwiki/xwiki-platform
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-9774: Wiki module must not override some wiki pages.
Merge remote-tracking branch 'upstream/master' into XWIKI-9774-2
XWIKI-9789: Inconsistency between the user scope and the "users" section in the administration of a subwiki.
XWIKI-9789: Inconsistency between the user scope and the "users" section in the administration of a subwiki.
Merge pull request #242 from gdelhumeau/XWIKI-9789

XWIKI-9789: Inconsistency between the user scope and the "users" section...
[Misc] Minor code cleaning.