XWIKI-10935: Recurrent stacktrace after having deleted a wiki

* fix bad merge