[Misc] Put back changes done by Sergiu that were mistakenly reverted by the mvn release:rollback, except for the parent version which we need to keep to an old version in order to better support old XWiki instances.