Index: core/kernel/src/main/java/com/sun/enterprise/v3/admin/AdminRESTConfigUpgrade.java
===================================================================
--- core/kernel/src/main/java/com/sun/enterprise/v3/admin/AdminRESTConfigUpgrade.java	(revision 44510)
+++ core/kernel/src/main/java/com/sun/enterprise/v3/admin/AdminRESTConfigUpgrade.java	(working copy)
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 2010 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010-2011 Oracle and/or its affiliates. All rights reserved.
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development
@@ -67,6 +67,12 @@
     @Inject
     Configs configs;
 
+    // http://java.net/jira/browse/GLASSFISH-15576
+    // This will force the Grizzly upgrade code to run before
+    // AdminRESTConfigUpgrade runs.
+    @Inject(name="grizzlyconfigupgrade", optional=true)
+    ConfigurationUpgrade precondition = null;
+
     @Override
     public void postConstruct() {
         for (Config config : configs.getConfig()) {
Index: admin/config-api/src/main/java/org/glassfish/config/support/GrizzlyConfigSchemaMigrator.java
===================================================================
--- admin/config-api/src/main/java/org/glassfish/config/support/GrizzlyConfigSchemaMigrator.java	(revision 44510)
+++ admin/config-api/src/main/java/org/glassfish/config/support/GrizzlyConfigSchemaMigrator.java	(working copy)
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 2009-2010 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009-2011 Oracle and/or its affiliates. All rights reserved.
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development
@@ -86,7 +86,7 @@
 import org.jvnet.hk2.config.types.Property;
 
 @SuppressWarnings({"deprecation"})
-@Service
+@Service(name="grizzlyconfigupgrade")
 public class GrizzlyConfigSchemaMigrator implements ConfigurationUpgrade, PostConstruct {
     private final static String SSL_CONFIGURATION_WANTAUTH = "com.sun.grizzly.ssl.auth";
     private final static String SSL_CONFIGURATION_SSLIMPL = "com.sun.grizzly.ssl.sslImplementation";