master
8186056: Miscellaneous changes imported from jsr166 CVS 2017-09
8187443: Forest Consolidation: Move files to unified layout