master
8187443: Forest Consolidation: Move files to unified layout
8237589: Fix copyright header formatting
8220083: Use InetAddress.getLoopbackAddress() in place of 127.0.0.1 for some tests