Address keybase/keybase-issues#1094

do the trivial unlock (of unlocked data) after a private key merge, too