XWIKI-9587: Never delete pages that have user modifications in them
Merge branch 'master' into feature-deleteconflict
Merge branch 'master' into feature-deleteconflict
XWIKI-9771: Just after an upgrade, the membership type of the wiki is not displayed in the Wiki Index (fixed).
XWIKI-9688: Top Active Members displays special characters badly.
XWIKI-9740 : Categories field updates (check / uncheck) are not taken into account after adding a new category when editing a blog post
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 pull request #238 from gdelhumeau/XWIKI-9771

XWIKI-9771: Just after an upgrade, the membership type of the wiki is not displayed in the Wiki Index
* Fixed
Merge pull request #240 from gdelhumeau/XWIKI-9688

XWIKI-9688: Top Active Members displays special characters badly.
XWIKI-9587: Never delete pages that have user modifications in them
XWIKI-9779
Partial revert of 71ebf97d which ate the line tabbing in XWiki.Registration
Revert "XWIKI-9516: Create a new Wiki API that replaces xwiki-platform-wiki-manager and xwiki-platform-workspace."

This reverts commit 71ebf97d9b228926bfcb088f47888fca802acb46.

Conflicts:
	xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-ui/xwiki-platform-wiki-ui-wiki/src/main/resources/XWiki/Registration.xml
XWIKI-9779: XWiki.Registration executes $doAfterRegistration twice
Once is because of the null check which unintentionally executes the code, thanks Anca for debugging it.
XWIKI-9782: New Crypto Service API

Work in progress, currently introduce support for:
 - common crypto types (keys, generation parameters, cipher parameters, ...)
 - string encoding (base64, hex, ...)
 - digests (MD5, SHA-1, SHA-224, ...)
 - symmetric CBC chained padded ciphers (AES, Blowfish, Cast, DES, RC2, ...)
 - asymmetric cipher (RSA)
 - key derivation functions (PKCS5S2, Scrypt, ...)
 - password based cyphers (using PBES2)

 Currently the scripting service is still empty, holding place for the legacy crypto service.
XWIKI-9782: New Crypto Service API

Fix dependencies.
XWIKI-9782: New Crypto Service API

Fix dependencies and versions.
XWIKI-9781: Bad link to help import global XAR when XWiki is empty
* Update the artifact id for the global XAR.
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