--- old/src/hotspot/share/runtime/arguments.cpp	2019-03-20 20:45:33.894803066 -0400
+++ new/src/hotspot/share/runtime/arguments.cpp	2019-03-20 20:45:33.069754906 -0400
@@ -530,6 +530,7 @@
   { "UseMembar",                    JDK_Version::jdk(10), JDK_Version::jdk(12), JDK_Version::undefined() },
   { "CompilationPolicyChoice",      JDK_Version::jdk(13), JDK_Version::jdk(14), JDK_Version::undefined() },
   { "FailOverToOldVerifier",        JDK_Version::jdk(13), JDK_Version::jdk(14), JDK_Version::undefined() },
+  { "AllowJNIEnvProxy",             JDK_Version::jdk(13), JDK_Version::jdk(14), JDK_Version::jdk(15) },
   { "ThreadLocalHandshakes",        JDK_Version::jdk(13), JDK_Version::jdk(14), JDK_Version::jdk(15) },
 
   // --- Deprecated alias flags (see also aliased_jvm_flags) - sorted by obsolete_in then expired_in:
--- old/src/hotspot/share/runtime/globals.hpp	2019-03-20 20:45:36.447952102 -0400
+++ new/src/hotspot/share/runtime/globals.hpp	2019-03-20 20:45:35.626904174 -0400
@@ -861,7 +861,7 @@
           "by the application (Solaris & Linux only)")                      \
                                                                             \
   product(bool, AllowJNIEnvProxy, false,                                    \
-          "Allow JNIEnv proxies for jdbx")                                  \
+          "(Deprecated) Allow JNIEnv proxies for jdbx")                     \
                                                                             \
   product(bool, RestoreMXCSROnJNICalls, false,                              \
           "Restore MXCSR when returning from JNI calls")                    \
--- old/test/hotspot/jtreg/runtime/CommandLine/VMDeprecatedOptions.java	2019-03-20 20:45:38.991100553 -0400
+++ new/test/hotspot/jtreg/runtime/CommandLine/VMDeprecatedOptions.java	2019-03-20 20:45:38.170052626 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, 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
@@ -46,6 +46,7 @@
         {"InitialRAMFraction",        "64"},
         {"TLABStats",                 "false"},
         {"ThreadLocalHandshakes",     "true"},
+        {"AllowJNIEnvProxy",          "true"},
 
         // deprecated alias flags (see also aliased_jvm_flags):
         {"DefaultMaxRAMFraction", "4"},