[Git][openldap/openldap][OPENLDAP_REL_ENG_2_5] 3 commits: ITS#8742 - More for bringing slapd.conf.5 and slapd-config.5 in sync