Merge "Use logstash configuration from OOM"