Bump JRuby & ES versions. Fix core-contrib (again) after branch delete.  Keep json filter in core.

I foolishly purged an old branch (instead of merging it) and it killed the remote commit.

That's sort of okay since it fixes the previous movement of the json filter to contrib (we're keeping it in core).