XWIKI-9423: Merge xwiki-platform-query-jpql-parser with xwiki-platform-query-xwql.