Sync up jruby-openssl bits with master.
Merge branch 'jruby-1_7'