Index: admin/config-api/src/main/java/org/glassfish/config/support/DomainXml.java
===================================================================
--- admin/config-api/src/main/java/org/glassfish/config/support/DomainXml.java	(revision 44657)
+++ admin/config-api/src/main/java/org/glassfish/config/support/DomainXml.java	(working copy)
@@ -146,6 +146,11 @@
 
     protected void upgrade() {
 
+        // Issue GLASSFISH-15599. Make sure GrizzlyConfigSchemaMigrator runs
+        // first. In 3.2, remove this and inject GrizzlyConfigSchemaMigrator
+        // into AdminConsoleConfigUpgrade properly
+        habitat.getComponent(GrizzlyConfigSchemaMigrator.class);
+
         // run the upgrades...
         for (Inhabitant<? extends ConfigurationUpgrade> cu : habitat.getInhabitants(ConfigurationUpgrade.class)) {
             try {