Merge "Add fluentd support"