master
8191142: More refactoring for naming deserialization cases
8187443: Forest Consolidation: Move files to unified layout
8244473: Contextualize registration for JNDI