Removed hacks for Logstash 1.3 bugs, added hacks for Logstash 1.4 bugs