consolidate: use KeychainProvider for deletion operation
consolidate: implement (mostly) recovery mode
Merge branch 'master' of github.com:open-keychain/open-keychain