Do not use obsolete SrvKeyspace.Shards
Fix keyspace_test
Merge branch 'liguo'