QueryCacheRestartTest test failure

Query tests fail with messages like:

testLocalQueryCacheRestart(org.infinispan.query.blackbox.QueryCacheRestartTest): It was expected to find the Query interceptor registered in the InterceptorChain but it wasn't found

This was working fine in https://infinispan.ci.cloudbees.com/job/Infinispan-master-JDK6-tcp/814/consoleText, so since the issue appears to be related to cache startup, it's almost for sure related to ISPN-2256 (appeared in https://infinispan.ci.cloudbees.com/job/Infinispan-master-JDK6-tcp/815/consoleText).
Btw, as part of fixing up ISPN-2290 to avoid duplicate domains, I'm making the tests that caused the testsuite to halt more resilient.