(cherry picked from commit 76c44a0a)

- Resetting the creation date and setting the creator/lastAuthor as the current user.

(cherry picked from commit 22af3c87)

- Removed unneeded spaces between velocity calls
- Removing unneeded {{velocity}} call that added a paragraph
- Removed unneeded if
- Fixed the indentation

(cherry picked from commit b22cdb8c)

XWIKI-13673: Wiki descriptor section from administration gives error on saving after changing owner.

(cherry picked from commit b2d8f40d)

(cherry picked from commit 507864d8)

XWIKI-10118:     XWIKI-10118  Container macro cannot be added more than once with different number of columns

Fix tests in xwiki-platform-dashboard-macro to reflect CSS class changes
(cherry picked from commit bb4bc952)

* Request the tree JSON through the current document so that relative references are correctly resolved.

(cherry picked from commit dcbc61de)

* Fix build for Java 7.

XWIKI-11611: Presentation Office documents (.ppt & .pptx) aren't displayed with LibreOffice 4.3.0.1+
* Upgrade the JODConverter version.

(cherry picked from commit 6fdc5577)

* Fix parent version after cherry-pick.

* Un-wrap the links generated from wiki syntax so that they are taken into account by jsTree.

(cherry picked from commit 9c5c05e1)

* Show the Attachments node when showAddAttachment=true, even if there are no attachments.
* Refactor a bit the code to remove duplication.

(cherry picked from commit 2d8f1bc5)

* Add missing dependency.

(cherry picked from commit 6f209fac)

* Move the hierarchy mapping in a separate file to avoid duplication.

(cherry picked from commit 42526269)

Revert "XWIKI-13468: The query used by the Document Tree to get the nested child pages is very costly"
* Too much duplication. Better move the hierarchy mapping in a separate file.

This reverts commit da8a821d.

(cherry picked from commit a9adeb63)

* Update the database-specific mapping files.

(cherry picked from commit da8a821d)

* Define a new Hibernate entity, XWikiPage, mapped to a SQL union between the documents table and the spaces table. This new entity is used in HQL queries to fetch the Nested Pages hierarchy.
* Separate the Document Tree code that queries the Nested Pages hierarchy from the code that displays the hierarchy. Move the former from Velocity to Java components. This way the Document Tree doesn't requrie PR for querying the Nested Pages hierarchy.
XWIKI-13615: "one more" does not make sense
* Query limit+1 child nodes and display only limit if there are more left.
XWIKI-12909: openTo doesn't work when root is specified as relative reference
XWIKI-13225: Finder in documentTree not working
* Resolve the relative root and openTo parameters.
XWIKI-13183: Some document tree branches not translated
* Display the translated page title
XWIKI-12832: Add support for sorting the pages by their title in the document tree
* Sort by the raw translated title field (with fall-back on the default title and then on page/space name)

(cherry picked from commit 8c642a7c)

(cherry picked from commit a56351ce)

(cherry picked from commit c3c735ca)

(cherry picked from commit b54cb3ea)

(cherry picked from commit 1136d236)

* Proper fix.

(cherry picked from commit e0b75b23)

* Best effort (we do no recommend to use rel="external" anymore).

(cherry picked from commit 087e0ff3)

* Use plain/1.0 as output syntax because the document title doesn't support HTML

(cherry picked from commit 57effda7)

(cherry picked from commit dd659c28)

(cherry picked from commit ecfaff2007f3b2d1f8d43294c7fa2ab5f18f0791)

(cherry picked from commit b02aa93c)

+ also removed the automatic start of the mail threads at startup (this was the case in the past but it was lost when the watchlist realtime feature introduced an event listener depending transitively on the MailSender component, and this made the threads start early, before the wiki has received the first request)

(cherry picked from commit 446dfce4)

(cherry picked from commit 5141a7cc)

XWIKI-13622: Searching by two words separated by at least two spaces causes the web browser to block
* There was an infinite loop because suggest.js was trying to highlight the empty string in the search results.

(cherry picked from commit f142061f)

(cherry picked from commit e7115671)

(cherry picked from commit 67bb3ac4)

* Fix build on Java 7