Logstash 1.2

Changes for logstash 1.2 conformance