[Misc] Prepare for upgrading xwiki.org to XWiki 5.4