Merge branch 'keys-misc' into keys-next

Miscellaneous keyrings changes.

Signed-off-by: David Howells <dhowells@redhat.com>