[Git][openldap/openldap][OPENLDAP_REL_ENG_2_5] Cleanup after filing bugs for several of these issues.