[Git][openldap/openldap][OPENLDAP_REL_ENG_2_4] 2 commits: ITS#9278