--- 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;