master
8344895: SM cleanup of module java.xml
8187443: Forest Consolidation: Move files to unified layout