In an external reparent, if the old master doesn't convert
to spare by itself, instead of scrapping it, we'll make it spare now.
Merge pull request #131 from youtube/replication

In an external reparent, if the old master doesn't convert