master
8187443: Forest Consolidation: Move files to unified layout
8297687: new URI(S,S,S,S) throws exception with incorrect index position reported in the error message