master
8317331: Solaris build failed with "declaration can not follow a statement (E_DECLARATION_IN_CODE)"
8187443: Forest Consolidation: Move files to unified layout