
These classes don't really need to throw a CmdLineException because the provided CmdLineParser is never actually used when reporting the error to the user. Replace the deprecated CmdLineException with IllegalArgumentException. Change-Id: I52efc3d70177cbaa4ae9c0d945b4afc558f504d2