Re-add EGD support, but make conditional, provide compatibility with LibreSSL, other small fixes provided by the BSD team