[Git][openldap/openldap][OPENLDAP_REL_ENG_2_5] 11 commits: ITS#9201 additional fixes