Merge branch 'master' into portable
Merge branch 'portable' of ssh.poolp.org:/git/opensmtpd into portable
remove builtin sqlite and ldap table backends
fix merge master conflicts