Merged revision(s) 1702770 from lucene/dev/trunk: LUCENE-6795: Fix Solr tests that break RamUsageTester on Java 9 Jigsaw