[Git][openldap/openldap][OPENLDAP_REL_ENG_2_5] 2 commits: Regenerate for ITS#9438