master
8228397: Missing license copyright header in some properties files
8187443: Forest Consolidation: Move files to unified layout