--- a/.hgtags	Wed Oct 07 11:32:07 2015 +0200
+++ b/.hgtags	Fri Oct 16 13:49:30 2015 +0100
@@ -327,3 +327,5 @@
 c20d8ebddaa6fb09cc81d3edf3d1d05f4232700a jdk9-b82
 ca8a1719588424f6e04e943790c7fcb7cb0b8c8f jdk9-b83
 df70bb200356fec686681f0295c50cc3ed43c3b3 jdk9-b84
+3ec06af1368924469f7ce60a00324bac55eaeecc jdk9-b85
+0a3f0d25c201b40575a7c3920fce4d6f4d3ae310 jdk9-b86

--- a/make/CompileInterim.gmk	Wed Oct 07 11:32:07 2015 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,68 +0,0 @@
-#
-# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# This must be the first rule
-default: all
-
-include $(SPEC)
-include MakeBase.gmk
-include JavaCompilation.gmk
-include SetupJavaCompilers.gmk
-
-################################################################################
-
-# Param 1 - Name of module to compile
-# Param 2 - Name of modules to depend on
-define SetupInterimModule
-  $$(eval $$(call SetupJavaCompilation, BUILD_INTERIM_$(strip $1), \
-      SETUP := GENERATE_OLDBYTECODE, \
-      SRC := $(wildcard $(JDK_TOPDIR)/src/$(strip $1)/share/classes \
-          $(CORBA_TOPDIR)/src/$(strip $1)/share/classes \
-          $(GENSRC_OUTPUTDIR)/$(strip $1)), \
-      EXCLUDES := com/sun/corba/se/PortableActivationIDL, \
-      EXCLUDE_FILES := module-info.java \
-          com/sun/corba/se/impl/presentation/rmi/JNDIStateFactoryImpl.java \
-          com/sun/corba/se/spi/presentation/rmi/StubWrapper.java \
-          org/omg/PortableInterceptor/UNKNOWN.java \
-          com/sun/tools/corba/se/idl/ResourceBundleUtil.java \
-          com/sun/corba/se/impl/presentation/rmi/jndi.properties, \
-      COPY := .prp, \
-      CLEAN := .properties, \
-      BIN := $(BUILDTOOLS_OUTPUTDIR)/override_modules/$(strip $1), \
-  ))
-
-  $$(BUILD_INTERIM_$(strip $1)): $$(foreach m, $2, $$(BUILD_INTERIM_$(strip $$m)))
-
-  TARGETS += $$(BUILD_INTERIM_$(strip $1))
-endef
-
-$(eval $(call SetupInterimModule, java.corba))
-$(eval $(call SetupInterimModule, jdk.rmic, java.corba))
-
-all: $(TARGETS)
-
-################################################################################
-
-all: $(BUILD_INTERIM_CORBA)

--- a/src/java.corba/share/classes/com/sun/corba/se/spi/orb/ORB.java	Wed Oct 07 11:32:07 2015 +0200
+++ b/src/java.corba/share/classes/com/sun/corba/se/spi/orb/ORB.java	Fri Oct 16 13:49:30 2015 +0100
@@ -89,6 +89,9 @@
 
 import com.sun.corba.se.impl.presentation.rmi.PresentationManagerImpl ;
 
+import jdk.internal.misc.JavaAWTAccess;
+import jdk.internal.misc.SharedSecrets;
+
 public abstract class ORB extends com.sun.corba.se.org.omg.CORBA.ORB
     implements Broker, TypeCodeFactory
 {
@@ -202,7 +205,7 @@
     public static PresentationManager getPresentationManager()
     {
         SecurityManager sm = System.getSecurityManager();
-        sun.misc.JavaAWTAccess javaAwtAccess = sun.misc.SharedSecrets.getJavaAWTAccess();
+        JavaAWTAccess javaAwtAccess = SharedSecrets.getJavaAWTAccess();
         if (sm != null && javaAwtAccess != null) {
             final Object appletContext = javaAwtAccess.getAppletContext();
             if (appletContext != null) {