Merge "Enable fluentd for horizon"