master
8187443: Forest Consolidation: Move files to unified layout
8197531: Miscellaneous changes imported from jsr166 CVS 2018-04