master
8187443: Forest Consolidation: Move files to unified layout
8272702: Resolving URI relative path with no / may lead to incorrect toString