merge envoy-unlocker into envoy
gpg-protocol: refactor
document envoy -u
envoy: cleanup unlocking