[Git][openldap/openldap][OPENLDAP_REL_ENG_2_6] 2 commits: ITS#10125: fix bad merge