--- a/src/share/vm/runtime/globals.cpp	Tue May 20 21:38:31 2014 +0200
+++ b/src/share/vm/runtime/globals.cpp	Tue May 20 13:46:34 2014 -0700
@@ -477,12 +477,12 @@
 }
 
 // Search the flag table for a named flag
-Flag* Flag::find_flag(const char* name, size_t length, bool allow_locked) {
+Flag* Flag::find_flag(const char* name, size_t length, bool allow_locked, bool allow_constant) {
   for (Flag* current = &flagTable[0]; current->_name != NULL; current++) {
     if (str_equal(current->_name, name, length)) {
       // Found a matching entry.
       // Don't report notproduct and develop flags in product builds.
-      if (current->is_constant_in_binary()) {
+      if (current->is_constant_in_binary() && !allow_constant) {
         return NULL;
       }
       // Report locked flags only if allowed.