Wait for cluster safe state before running the query
Merge pull request #4210 from ajermakovics/mast/query-basic-test-4200

QueryBasicTest. Wait for cluster safe state before running the query