XWIKI-9774: Wiki module must not override some wiki pages.
Merge remote-tracking branch 'upstream/master' into XWIKI-9774-2
Merge remote-tracking branch 'upstream/master' into XWIKI-9774-2
XWIKI-9774: Wiki module must not override some wiki pages.
Revert "XWIKI-9774: Wiki module must not override some wiki pages."

This reverts commit 88c913551cfd38c73ae6dd2eb1079eb99a4cd0f3.
Merge pull request #244 from gdelhumeau/XWIKI-9774-2

XWIKI-9774: Wiki module must not override some wiki pages.