Merge remote-tracking branch 'drebs/bug/3397-keymanager-should-support-bundled-gpg...