Fix method clumping preventing JDK8 from building JRuby.

Fixes #1032.
Merge branch 'jruby-1_7'