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-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.
Merge pull request #241 from gdelhumeau/master

[Misc] Add missing translations.
XWIKI-9309: Also search in attachments when type is DOCUMENT
* Use a different query boost (default index fields and their boost factor) depending on the selected results type (i.e. depending on what we search for: documents, attachments, objects, object properties)
* Use by default (for free text search) only the index fields that are indexed as 'text_general' (and equivalent). It doesn't make sense to search free text in fields that are not analized (i.e. that keep the exact value for faceting).
XWIKI-9309: Also search in attachments when type is DOCUMENT
* Use dedicated search fields based on the selected search results type.
* Displays dedicated search fields for attachments.
XWIKI-9309: Also search in attachments when type is DOCUMENT
* Fix test failure due to nondeterministic order.
XWIKI-9120: Extension Manager shouldn't add new versions of attachments when no changes have been made to the document
XWIKI-9779: XWiki.Registration executes $doAfterRegistration twice
* Fixed remaining #end

Caleb still needs to update the comment. I didn't do it since I don't fully understand the code logic.
XWIKI-9309: Also search in attachments when type is DOCUMENT
* Fix attachment search results display (was showing unuseful document information)
* Refactor the search result display to separate the display for each result type (entity type)
XWIKI-9779: XWiki.Registration executes $doAfterRegistration twice

Added a comment explaining the significance of toString() and applied the patch to xwiki-platform-wiki-ui which duplicates the code.