Merge commit '6eae58a9' into ubuntu/focal

CHANGES

Makefile.in

aclocal.m4

build/lib.mk

build/openldap.m4

build/version.var

clients/tools/ldapdelete.c

configure

configure.ac

contrib/ldaptcl/tclAppInit.c

contrib/ldaptcl/tkAppInit.c

contrib/slapd-modules/datamorph/tests/run

contrib/slapd-modules/emptyds/tests/run

contrib/slapd-modules/variant/slapo-variant.5

...pd-modules/variant/tests/data/test001-04a-same-regex.ldif

...pd-modules/variant/tests/data/test001-04b-same-regex.ldif

contrib/slapd-modules/variant/tests/run

contrib/slapd-modules/variant/variant.c

doc/guide/admin/aspell.en.pws

doc/guide/admin/overlays.sdf