Merge topic 'fixargs'

b7a6be18c2 CommandLineTest: Fix outdated arguments

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !10279