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