JRuby 1.7.10 upgrade
Merge pull request #2533 from tedpennings/jruby_1.7.10

JRuby 1.7.10 upgrade