CLI import help changes

Another set of changes for the CLI import suggested by @manics.
To test this PR, check the ouput of

- ``bin/omero --java-help`
- ``bin/omero --advanced-help``