Merge branch 'feature-log-logstash' of github.com:pyr/collectd into feature-log-logstash