master
8348872: jabswitch.cpp: regEnable and regDeleteValue leak reallocated data buffer
8187443: Forest Consolidation: Move files to unified layout