Scope the Unicode module so NameErrors make more sense.
Handle another case of the 'unicode' gem breaking things on JRuby.

This is was an omission from pull request #2315.
Merge pull request #2318 from nirvdrum/more_unicode_jruby_cleanup

More unicode jruby cleanup.