master
8362958: Unnecessary copying / sorting in Streams using Comparator.naturalOrder()
8187443: Forest Consolidation: Move files to unified layout