Simplifying RebuildShard call.
Fixing / adding messaging.
Merge commit 'f7df4e7e97e66a6b3f3a9b2ea5645ec4d88e1c49' into replication
Merge branch 'replication'