[Git][openldap/openldap][OPENLDAP_REL_ENG_2_5] 8 commits: ITS#7786 - Fix typo in prev commit