master
8238170: BeanContextSupport remove and propertyChange can deadlock
8187443: Forest Consolidation: Move files to unified layout