Removing flakiness in this test. The queryIndex variable was
being accessed concurrently.
Merge branch 'master' into replication
Merge pull request #142 from youtube/replication

Replication