master
8187443: Forest Consolidation: Move files to unified layout
8282657: Code cleanup: removing double semicolons at the end of lines