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

QueryIndexingTest. Doing cluster safety check after map is filled (backport)