[Issue 9917] Remove -h and -p from options[] in client tools