Doing cluster safety check after map is filled.
Merge pull request #4184 from ajermakovics/mast/query-indexing-test-4114

QueryIndexingTest. Doing cluster safety check after map is filled