Add upgrade path for new OSX keychain storage