master
8187443: Forest Consolidation: Move files to unified layout
8193302: Javac AssertionError: typeSig ERROR on usage of @Generated