CB-2188: Fixed the password not deleting out of the keychain when migrating from the release 4 version to a version that uses tokens