Now exposing the lockserver version for keyspace and shard.
Merge branch 'master' into resharding
Merge branch 'master' into resharding
Bug fix for import. Sugu will do more later.
Merge branch 'resharding'
Merge branch 'trusty'