Merge "keystore: fix upgrades"