ISPN-3464 Remove optional dependency in infinispan-query