Final modifications to get things building.
Incorporate updates from JRuby master in prep for splitting off.