Merge "Revert use of DaemonSet for logstash"