[Git][openldap/openldap][OPENLDAP_REL_ENG_2_5] ITS#9894 - Further fixes for 2.5