Fix from 1.4:

• keyedit.c (keyedit_menu): If we modify the keyblock (via

fix_keyblock() or collapse_uids()) make sure we reprocess the
keyblock so the flags are correct. Noted by Robin H. Johnson.

• getkey.c (fixup_uidnode): Properly clear flags that don't apply

to us (revoked, expired) so that we can reprocess a uid.