master
8298047: Remove all non-significant trailing whitespace from properties files
8347123: Add missing @serial tags to other modules
8187443: Forest Consolidation: Move files to unified layout