Merge "Refresh fluentd|kibana5x|grafana repo"