ITS9054 and ITS9318 backports

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

Backport work on ITS9054 and ITS9318 to RE24

Merge request reports