The o.a.f.cli.CommandLineOptions class is very ad-hoc. It may make sense to switch to Apache Commons CLI to have both a more powerful and simpler parsing of command-line options. The problem is, the CLI 1.x branch is no longer maintained apart from bug fixes, and the 2.x branch has not been officially released yet. Plus it might not be worth the additional dependency. To do: find the best way of solving this issue.
resetting P2 open bugs to P3 pending further review