[Git][openldap/openldap][OPENLDAP_REL_ENG_2_5] 2 commits: ITS#8618 - Remove deprecated -h and -p options to client tools