CLI args take precedence over local configuration files

There was a problem if using a command line argument when a local configuration file is present already. The option was interpreted twice. This fix also applies to mesos and marathon startup scripts.