Backport !1477 D-Bus keyring handling fixes to glib-2-64

Philip Withnallrequested to merge
pwithnall/glib:backport-1477-dbus-keyring-handling-glib-2-64 into glib-2-64

Trivial backport of !1477 (merged) to glib-2-64.

Merge request reports