master
8214971: Replace use of string.equals("") with isEmpty()
8187443: Forest Consolidation: Move files to unified layout
8232076: Suppress warnings on non-serializable non-transient instance fields java.naming