diff --git a/.hgtags-top-repo b/.hgtags-top-repo
index 4284c9e7cfd..1dcaf7ef62c 100644
--- a/.hgtags-top-repo
+++ b/.hgtags-top-repo
@@ -316,3 +316,4 @@ eed77fcd77711fcdba05f18fc22f37d86efb243c jdk9-b70
 c706ef5ea5da00078dc5e4334660315f7d99c15b jdk9-b71
 8582c35016fb6211b373810b6b172feccf9c483b jdk9-b72
 4c2cbaae528bce970dabbb5676005d379357f4b6 jdk9-b73
+57f3134853ecdd4a3ee2d4d26f22ba981d653d79 jdk9-b74
diff --git a/make/jprt.properties b/make/jprt.properties
index b0d59a51b18..e882b8a21a9 100644
--- a/make/jprt.properties
+++ b/make/jprt.properties
@@ -121,10 +121,11 @@ jprt.i586.fastdebugOpen.build.configure.args=				\
     ${jprt.fastdebugOpen.build.configure.args}
 jprt.i586.productOpen.build.configure.args=				\
     ${my.i586.default.build.configure.args}				\
-    ${jprt.productOpen.build.configure.args}jprt.windows_i586.build.configure.args= \
-    --with-devkit=$VS2013_HOME \
+    ${jprt.productOpen.build.configure.args}
+jprt.windows_i586.build.configure.args=					\
+    --with-devkit=$VS2013_HOME						\
     ${jprt.i586.build.configure.args}
-jprt.windows_x64.build.configure.args= \
+jprt.windows_x64.build.configure.args=					\
     --with-devkit=$VS2013_HOME
 
 ########
diff --git a/modules.xml b/modules.xml
index e079f58fd83..6850ac07193 100644
--- a/modules.xml
+++ b/modules.xml
@@ -1777,6 +1777,11 @@
     <name>jdk.policytool</name>
     <depend>java.base</depend>
     <depend>java.desktop</depend>
+    <depend>java.logging</depend>
+    <depend>java.management</depend>
+    <depend>java.security.jgss</depend>
+    <depend>java.sql</depend>
+    <depend>jdk.security.jgss</depend>
   </module>
   <module>
     <name>jdk.rmic</name>
diff --git a/test/lib/share/classes/jdk/test/lib/hprof/model/Snapshot.java b/test/lib/share/classes/jdk/test/lib/hprof/model/Snapshot.java
index 635c0baa9a0..6150543b36b 100644
--- a/test/lib/share/classes/jdk/test/lib/hprof/model/Snapshot.java
+++ b/test/lib/share/classes/jdk/test/lib/hprof/model/Snapshot.java
@@ -276,10 +276,8 @@ public class Snapshot implements AutoCloseable {
         fakeClasses.clear();
 
         weakReferenceClass = findClass("java.lang.ref.Reference");
-        if (weakReferenceClass == null)  {      // JDK 1.1.x
-            weakReferenceClass = findClass("sun.misc.Ref");
-            referentFieldIndex = 0;
-        } else {
+        referentFieldIndex = 0;
+        if (weakReferenceClass != null)  {
             JavaField[] fields = weakReferenceClass.getFieldsForInstance();
             for (int i = 0; i < fields.length; i++) {
                 if ("referent".equals(fields[i].getName())) {