Merge branch 'its9917' into 'master'

Remove 'h' and 'p' from options[] in client tools

See merge request !569
4 jobs for !569 with its9917 into master in 68 minutes and 38 seconds (queued for 43 minutes and 20 seconds)
latest