Merge "Environment for logstash not seen by logstash"