[Git][openldap/openldap][OPENLDAP_REL_ENG_2_5] 4 commits: ITS#9917 Remove 'h' and 'p' from options[] in client tools