No more flakyness in this test.
Bigger timeout.
Adding extra logging.
Merge branch 'master' of github.com:youtube/vitess