Merge "Move fluentd under agent role"