Update JRuby

This change updates the version of JRuby to 1.7.12.

It also updates the default version of Tomcat to match the latest
version specified in the previous update.
Merge branch 'update-jruby'