XWIKI-10290: Empty HQL query throws exception
* Fix test merge.