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