QueryInterceptor & ClusterRegistry fixes

https://issues.jboss.org/browse/ISPN-4612
https://issues.jboss.org/browse/ISPN-4604
https://issues.jboss.org/browse/ISPN-3819

Fixes some issues in the QueryInterceptor and reenables the test who exposed them