MNK-5954 :  CacheManagerSamplerImplTest failed with unexpected exception 
* relying on a TestQueryManagerBuilder to get a QueryManagerBuilder for testing

git-svn-id: http://svn.terracotta.org/svn/ehcache@8587 b9324663-ca0f-0410-8574-be9b3887307d
MNK-5954 : merge from trunk

git-svn-id: http://svn.terracotta.org/svn/ehcache@8588 b9324663-ca0f-0410-8574-be9b3887307d