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
[Misc] Improved javadoc
[misc] Add comments to explain the Solr index fields.
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-9782: New Crypto Service API

Fix a badly named classes
XWIKI-9120: Extension Manager shouldn't add new versions of attachments when no changes have been made to the document
XWIKI-9309: Also search in attachments when type is DOCUMENT
* Index attachment author, date and size
* Make sure we can sort attachment results by file name, author, date and size
* Duplicate attachment data on document index rows (using multiValued fields, so the relation between various attachment meta data is lost -- we won't know that a file size corresponds to a file name)
* Add media type, author, date and size facets for attachments.
* Refactor (and improve) DocumentSolrMetadataExtractorTest
XWIKI-9309: Also search in attachments when type is DOCUMENT
* Improve the display of the attachment search facets
* Update the search UI after some of the attachment index fields have become multiValued.
[Misc] Add missing translations.
Merge pull request #241 from gdelhumeau/master

[Misc] Add missing translations.