Feature/6210 key newer

Use gnupg to merge keys if it's an update of an existing key. This is needed to prevent roll back attacks where the attacker push us to accept a key with an old expiration date that could be use to push an untrusted key when after it's expiration.
s/EXPIRITY/EXPIRY/ i guess.