--- a/src/java.base/share/classes/java/security/Security.java	Wed Jun 27 09:52:23 2018 +0200
+++ b/src/java.base/share/classes/java/security/Security.java	Wed Jun 27 09:36:34 2018 -0400
@@ -31,6 +31,7 @@
 import java.net.URL;
 
 import jdk.internal.misc.SharedSecrets;
+import jdk.internal.util.StaticProperty;
 import sun.security.util.Debug;
 import sun.security.util.PropertyExpander;
 
@@ -214,7 +215,7 @@
         // maybe check for a system property which will specify where to
         // look. Someday.
         String sep = File.separator;
-        return new File(System.getProperty("java.home") + sep + "conf" + sep +
+        return new File(StaticProperty.javaHome() + sep + "conf" + sep +
                         "security" + sep + filename);
     }