Its9279 re24

Merged Quanah Gibson-Mount requested to merge (removed):its9279-re24 into OPENLDAP_REL_ENG_2_4

Changes for ITS#9279 for RE24

Merge request reports