[Git][openldap/openldap][OPENLDAP_REL_ENG_2_5] 24 commits: Return to engineering