Merge "keystore: add "migrate" command"