merge with main branch

clients/gopher/go500gw.c

clients/gopher/setproctitle.c

clients/ud/util.c

include/avl.h

include/disptmpl.h

include/lber.h

include/ldap.h

include/ldapconfig.h.edit

servers/slapd/Makefile.in

servers/slapd/acl.c

servers/slapd/back-ldbm/Makefile.in

servers/slapd/back-ldbm/alias.c

servers/slapd/back-ldbm/group.c

servers/slapd/back-ldbm/id2entry.c

servers/slapd/back-ldbm/proto-back-ldbm.h

servers/slapd/back-ldbm/search.c

servers/slapd/backend.c

servers/slapd/bind.c

servers/slapd/config.c

servers/slapd/delete.c