Jruby tweaks for 2-99-maintenance also pair this branch to 2-99 on other repos

See rspec/rspec-core#957 and #274 for the JRuby tweaks.

I've paired this branch to the 2-99 branches on the other repos which means it will pass the build, we might want to do this on the other repositories so they remain in lock step.