[Issue_515] Provide a CliMain variant that doesn't call System.exit

[Issue_515] Provide a CliMain variant that doesn't call System.exit #831