master
8187443: Forest Consolidation: Move files to unified layout
8182610: Update specification of service providers for IIORegistry and ServiceRegistry