master
8187443: Forest Consolidation: Move files to unified layout
8223856: Replace wildcard address with loopback or local host in tests - part 8