master
8187443: Forest Consolidation: Move files to unified layout
8230967: Improve Registry support of clients