merges from chef-logstash - upstream