Support scrap master in ShardExternallyReparented.
Merge pull request #24 from youtube/reparent-fix

Support scrap master in ShardExternallyReparented.