Need to backport ISPN-4464 "Unify test suite for remote and embedded DSL based query tests" to reduce future merging effort
PR for jdg 6.4.x here: https://github.com/infinispan/jdg/pull/323
PR: https://github.com/infinispan/jdg/pull/323