fixes testMapWithIndexAfterShutDown
fixes testMapWithIndexAfterShutDown
fixes testMapWithIndexAfterShutDown
Merge pull request #2002 from ahmetmircik/queryTestFix

Fixes issue #2001