Apply diffs from JRuby to Ruby 2.2 HEAD.