master
8187443: Forest Consolidation: Move files to unified layout
8382928: Add documentation to java.net.URI.normalize about empty segments