Merge "Update fluentd templates" into release/2019.2.0