Sync with HEAD

CHANGES

build/version.var

include/ldap.h

libraries/libldap/error.c

libraries/libldap/ldap-int.h

libraries/libldap/request.c

libraries/libldap/result.c

libraries/libldap/tls.c

servers/slapd/back-meta/config.c

servers/slapd/back-meta/conn.c

servers/slapd/bconfig.c

servers/slapd/daemon.c

servers/slapd/extended.c

servers/slapd/main.c

servers/slapd/overlays/rwmconf.c

servers/slurpd/main.c