Re-working ShardExternallyReparented.

So it works with Shard having the master record.