Fix simple bugs to topo.Server testing.
Merge branch 'master' of github.com:youtube/vitess
Merge branch 'master' into resharding