master
8298047: Remove all non-significant trailing whitespace from properties files
8187443: Forest Consolidation: Move files to unified layout