Merge branch 'keys-devel' into next-keys

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