Fix flakiness in vtgatev2_test
Merge branch 'master' into replication