Fix tabletmanager test.
Merge branch 'testfix'
Merge branch 'master' of github.com:youtube/vitess