Comment 61 for bug 1771880

Thanks Damjan for the investigation work and the fixes, I've cherrypicked the gcr fix and uploaded to Debian now (which will sync to Ubuntu later today).

I would prefer to see an upstream review for the keyring change before distro patching that one since the situation there is a bit more complicated