master
7903760: Revert "7903622: Remove support for `jtdiff`"
7904084: Unset javaOpts and jtregOpts in jtreg.sh