--- old/src/jdk.jpackage/share/classes/jdk/jpackage/internal/Arguments.java	2019-01-31 19:15:38.133099600 -0800
+++ new/src/jdk.jpackage/share/classes/jdk/jpackage/internal/Arguments.java	2019-01-31 19:15:36.890975400 -0800
@@ -125,7 +125,7 @@
     private boolean hasMainModule = false;
     private boolean hasTargetFormat = false;
     private boolean hasAppImage = false;
-    private boolean retainBuildRoot = false;
+    public boolean userProvidedBuildRoot = false;
 
     private String buildRoot = null;
     private String mainJarPath = null;
@@ -310,7 +310,7 @@
 
         BUILD_ROOT ("build-root", OptionCategories.PROPERTY, () -> {
             context().buildRoot = popArg();
-            context().retainBuildRoot = true;
+            context().userProvidedBuildRoot = true;
             setOptionValue("build-root", context().buildRoot);
         }),
 
@@ -438,7 +438,7 @@
             argContext = context;
         }
 
-        private static Arguments context() {
+        public static Arguments context() {
             if (argContext != null) {
                 return argContext;
             } else {
@@ -737,7 +737,7 @@
                 if (bundler.validate(localParams)) {
                     File result =
                             bundler.execute(localParams, deployParams.outdir);
-                    if (!retainBuildRoot) {
+                    if (!userProvidedBuildRoot) {
                         bundler.cleanup(localParams);
                     }
                     if (result == null) {
@@ -767,7 +767,7 @@
                         bundler.getName(), re.toString()));
                 Log.debug(re);
             } finally {
-                if (retainBuildRoot) {
+                if (userProvidedBuildRoot) {
                     Log.verbose(MessageFormat.format(
                             I18N.getString("message.debug-working-directory"),
                             (new File(buildRoot)).getAbsolutePath()));