Remove fluentd
Minor change for fluentd host
Merge branch 'develop'