A few general fixes from Honza

Signed-off-by: Christine Caulfield <ccaulfie@redhat.com>
Honza's patch for comparing key values
Don't overwrite RO keys

Signed-off-by: Christine Caulfield <ccaulfie@redhat.com>