ZING-1735: Fixed logic for checking command line options
ZING-1735: Fixed logic for checking command line options

control-center/serviced,control-center/serviced,control-center/serviced,control-center/serviced,control-center/serviced,control-center/serviced,control-center/serviced,control-center/serviced