Replace PgpGeneralException with NotFoundException where appropriate
Merge branch 'development' of github.com:open-keychain/open-keychain into development