Do not use obsolete SrvKeyspace.Shards
Fix keyspace_test
Merge branch 'liguo'
Merge branch 'master' of github.com:youtube/vitess
Merge branch 'master' into replication