Fixed a failing live xwiki test
Merge remote-tracking branch 'xwiki/master'