Ok fine, only define these in 1.9 mode.
Merge remote-tracking branch 'origin/jruby-1_7'
Keeping it happy for merges.

Revert "Ok fine, only define these in 1.9 mode."

This reverts commit de3bf87d3d2703b04d616e56035c7b97a811b717.