Workaround for unknown bug in reparent.

It needs to be fixed, but until then, using old vtctl way
instead of RPC. And misc cleanup.