Merge "explicitly set fluentd service_provider"