Fix timeout is being ignored
Merge branch 'master' of github.com:youtube/vitess