Feature/centos7 compat

don't start with --agent --master, then you won't be able to override in defaults file. the Environment stanza should take care of this.