Merge "Added td_agent_options param for fluentd"