XWIKI-9131: xwiki.virtual_mode propety is inserted at the wrong location in the hibernate configuration file
(cherry picked from commit 57775e798bad5fcf21b31218d05b3ebf5d1dc250)
XWIKI-9116: Deleted pages are installed again after a Distribution Wizard upgrade
(cherry picked from commit 9d9722296c96603c118f7427fa79f1ef066cd81b)

Conflicts:
	xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-handlers/xwiki-platform-extension-handler-xar/src/test/java/org/xwiki/extension/xar/XarExtensionHandlerTest.java