Param ordering (rebased onto dev_4_4)



This is the same as gh-1474 but rebased onto dev_4_4.

----

Patches provided by @ctrueden for making the parameters in the CLI more closely match those in the UIs.

/cc @will-moore