Put command-specific option help first.

This reorders CLI option help, to put all the generic stuff (host, owner, pyro-timeout etc.) after any command-specific options.

Test battery passes, and user guide make works (which generates all command help).

@arjclark - please review.