Update to latest keymanager API and support bundled GPG.