Issue #1211: Upgrade to XWiki 5.4.6
Done
[cleanup] Use 2 spaces for indentation instead of 4
[misc] Bulletproofing header style