Fix core-contrib (again) after branch delete.  Keep json filter in core.
Merge pull request #1035 from untergeek/core-contrib

Bump JRuby & ES versions. Fix core-contrib (again) after branch delete.  Keep json filter in core.
Merge git://github.com/logstash/logstash