master
8187443: Forest Consolidation: Move files to unified layout
8193300: Miscellaneous changes imported from jsr166 CVS 2018-01
8203681: Miscellaneous changes imported from jsr166 CVS 2018-06
8221924: get(null) on single-entry unmodifiable Map returns null instead of throwing NPE