Fixing comment.
Removin Replica and Rdonly from Shard.
Merge branch 'master' into resharding
Merge branch 'barnacle'