Merge branch 'master' into replication
Basic support for sharding key name and type.
Fixing this test after my path changes.
Adding SetKeyspaceShardingInfo.

Also adding Sharding fields to SrvKeyspace.
Missed a help text.
Merge commit 'c6d4f2bf637bfd3bbe4f8d7404c28031e6265df9'