master
8187443: Forest Consolidation: Move files to unified layout
8231785: Improved socket permissions