Merge changes I65f7a915,I32098dc0

* changes:
  KeyStore: add "migrate" command
  KeyStore: add API to uid versions