master
8355002: Clean up some mentions of "applet" in tests
8187443: Forest Consolidation: Move files to unified layout