master
8187443: Forest Consolidation: Move files to unified layout
8216417: cleanup of IPv6 scope-id handling
8202091: Rename DualStackPlainSocketImpl to PlainSocketImpl [win]