Fix tabletmanager test.
Merge branch 'testfix'
Prep work for alternate ways to export variables, and more comments and
tests.
Merge branch 'master' of github.com:youtube/vitess
Prep work for alternate ways to export variables, and more comments and
tests.
Merge branch 'sougou-work'
Prep work for alternate ways to export variables, and more comments and tests.
Merge branch 'master' into resharding