Index: cluster/gms-adapter/src/main/java/org/glassfish/gms/GMSConfigUpgrade.java
===================================================================
--- cluster/gms-adapter/src/main/java/org/glassfish/gms/GMSConfigUpgrade.java	(revision 43931)
+++ cluster/gms-adapter/src/main/java/org/glassfish/gms/GMSConfigUpgrade.java	(working copy)
@@ -61,7 +61,7 @@
  * @author Bhakti Mehta
  *
  */
-@Service
+@Service(name="gmsupgrade")
 public class GMSConfigUpgrade implements ConfigurationUpgrade, PostConstruct {
 
     @Inject
Index: admin/config-api/src/main/java/org/glassfish/config/support/UpgradeService.java
===================================================================
--- admin/config-api/src/main/java/org/glassfish/config/support/UpgradeService.java	(revision 43931)
+++ admin/config-api/src/main/java/org/glassfish/config/support/UpgradeService.java	(working copy)
@@ -72,6 +72,14 @@
     @Inject
     Domain domain;
 
+    /*
+     * Required to make gms changes before any changes to a cluster
+     * or config can be saved. This is because GMS changed attribute
+     * names from v2 to 3.1. (Issue 15195.)
+     */
+    @Inject(name="gmsupgrade", optional=true)
+    ConfigurationUpgrade precondition = null;
+
     private final static Logger logger = Logger.getAnonymousLogger();
 
     private static final String MODULE_TYPE = "moduleType";
Index: admin/config-api/src/main/java/org/glassfish/config/support/SystemPropertyUpgrade.java
===================================================================
--- admin/config-api/src/main/java/org/glassfish/config/support/SystemPropertyUpgrade.java	(revision 43931)
+++ admin/config-api/src/main/java/org/glassfish/config/support/SystemPropertyUpgrade.java	(working copy)
@@ -77,6 +77,14 @@
     @Inject
     Servers servers;
 
+    /*
+     * Required to make gms changes before any changes to a cluster
+     * or config can be saved. This is because GMS changed attribute
+     * names from v2 to 3.1. (Issue 15195.)
+     */
+    @Inject(name="gmsupgrade", optional=true)
+    ConfigurationUpgrade precondition = null;
+
     private static String PREFIX = "2";
     private int DEFAULT_ADMIN_PORT = 4848;
     private static final String DAS_CONFIG = "server-config";