Comment out flaky tests
Fix typo
Merge branch 'master' of github.com:youtube/vitess