Common: Re-order options and parameters in usage synopsis

[rsenden]

Currently, parameters and options are mostly displayed in the order in which they are defined in the various command classes. Preferably, the synopsis should display options and parameters in the following order:
<positional parameters> <command options> <generic options (help, version, logging, session name)>

We'll need to check whether picocli provides functionality for this; I think there's an order parameter on @Option and other annotations; so we need to check whether we can properly use these to display parameters and options in the order suggested above.