master
8187443: Forest Consolidation: Move files to unified layout
8360045: StringTokenizer.hasMoreTokens() throws NPE after nextToken(null)