Merge pull request #403 from axsh/bugfix-config-files

Bugfix config files
Merge branch 'master' into ha-monitor-agent