--- old/src/share/vm/runtime/arguments.cpp	2014-04-03 16:02:04.060839559 +0400
+++ new/src/share/vm/runtime/arguments.cpp	2014-04-03 16:02:03.800712827 +0400
@@ -3367,8 +3367,13 @@
   if (os::getenv(name, buffer, sizeof(buffer)) &&
       !os::have_special_privileges()) {
     JavaVMOption options[N_MAX_OPTIONS];      // Construct option array
-    jio_fprintf(defaultStream::error_stream(),
-                "Picked up %s: %s\n", name, buffer);
+
+    bool suppress_message = false;            // the message will be printed unless requested not to
+    char message[OPTION_BUFFER_SIZE + 256];   // enough space for the options, message and the variable name
+    jio_snprintf(message, sizeof(message),    // message with the unmodidied yet buffer
+                 "Picked up %s: %s\n",
+                 name, buffer);
+
     char* rd = buffer;                        // pointer to the input string (rd)
     int i;
     for (i = 0; i < N_MAX_OPTIONS;) {         // repeat for all options in the input string
@@ -3380,7 +3385,19 @@
       // input string (rd).
       char* wrt = rd;
 
-      options[i++].optionString = wrt;        // Fill in option
+      options[i].optionString = wrt;          // Fill in option
+
+      // Check if we're requested to suppress the message about picking up options
+      const char* tail;
+      if (match_option(&options[i], "-XX:+SuppressJavaOptsOutput", &tail) &&
+          (*tail == 0 || isspace(*tail))) {
+        suppress_message = true;
+        // remove the -XX:+SuppressJavaOptsOutput option from further processing
+        rd += tail - rd;
+        continue;
+      }
+
+      i++;
       while (*rd != 0 && !isspace(*rd)) {     // unquoted strings terminate with a space or NULL
         if (*rd == '\'' || *rd == '"') {      // handle a quoted string
           int quote = *rd;                    // matching quote to look for
@@ -3388,7 +3405,8 @@
           while (*rd != quote) {              // include everything (even spaces) up until quote
             if (*rd == 0) {                   // string termination means unmatched string
               jio_fprintf(defaultStream::error_stream(),
-                          "Unmatched quote in %s\n", name);
+                          "%sUnmatched quote in %s\n",
+                          suppress_message ? "" : message, name);
               return JNI_ERR;
             }
             *wrt++ = *rd++;                   // copy to option string
@@ -3406,6 +3424,9 @@
       }
       *wrt = 0;                               // Zero terminate option
     }
+    if (!suppress_message) {
+      jio_fprintf(defaultStream::error_stream(), "%s", message);
+    }
     // Construct JavaVMInitArgs structure and parse as if it was part of the command line
     JavaVMInitArgs vm_args;
     vm_args.version = JNI_VERSION_1_2;
--- /dev/null	2014-04-03 14:26:36.095712459 +0400
+++ new/test/runtime/8039152/JavaToolOptions.java	2014-04-03 16:02:05.181385480 +0400
@@ -0,0 +1,63 @@
+/*
+ * 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.
+ *
+ * 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.
+ */
+
+/*
+ * @test
+ * @bug 8036621
+ * @summary -XX:+SuppressJavaOptsOutput should suppress message printed to
+ *          stderr when picking up options from JAVA_TOOL_OPTIONS or
+ *         _JAVA_OPTIONS environment variables
+ * @library /testlibrary
+ * @build JavaToolOptions
+ * @run main JavaToolOptions
+ */
+
+import com.oracle.java.testlibrary.ProcessTools;
+import com.oracle.java.testlibrary.OutputAnalyzer;
+
+public class JavaToolOptions {
+    public static void main(String args[])
+            throws Throwable {
+        for (String varName: new String[] {"JAVA_TOOL_OPTIONS", "_JAVA_OPTIONS"}) {
+            test(varName, "-Ddummy.option", false);
+            test(varName, "-XX:+SuppressJavaOptsOutput", true);
+            test(varName, "-Ddummy.option -XX:+SuppressJavaOptsOutput", true);
+            test(varName, "-XX:+SuppressJavaOptsOutput -Ddummy.option", true);
+            test(varName, "-Ddummy.option=\" -XX:+SuppressJavaOptsOutput \"", false);
+        }
+    }
+
+    static void test(String varName, String options, boolean suppressed)
+            throws Throwable {
+        final String message = "Picked up " + varName + ": " + options;
+        ProcessBuilder pb = ProcessTools.createJavaProcessBuilder("-version");
+        pb.environment().put(varName, options);
+        OutputAnalyzer output = new OutputAnalyzer(pb.start());
+        if (suppressed) {
+            output.stderrShouldNotContain(message);
+        } else {
+            output.stderrShouldContain(message);
+        }
+        output.shouldHaveExitValue(0);
+    }
+}