[Git][openldap/openldap][OPENLDAP_REL_ENG_2_5] 51 commits: ITS#9461 refix ITS#9376