Enhance workaround for WeakMap with jruby >= 9.4.6.0#2360

iaddict wants to merge 3 commits intorsim:masterrsim/oracle-enhanced:masterfrom

iaddict:masteriaddict/oracle-enhanced:masterCopy head branch name to clipboard