master
8187443: Forest Consolidation: Move files to unified layout
8213325: (props) Properties.loadFromXML does not fully comply with the spec