[Git][openldap/openldap][OPENLDAP_REL_ENG_2_5] 5 commits: ITS#9438