Various test fixes.
Merge branch 'master' of github.com:youtube/vitess