comment class logstash
Merge remote-tracking branch 'origin/edge' into edge