Merge branch 'dev' of https://github.com/rjrudin/ml-app-deployer into…

… feature/issue-28-add-temporal-config

# Conflicts:
#	src/main/java/com/marklogic/appdeployer/command/SortOrderConstants.java

src/main/java/com/marklogic/appdeployer/command/SortOrderConstants.java

@@ -24,8 +24,6 @@ public abstract class SortOrderConstants {
     public static Integer UPDATE_REST_API_SERVERS = 250;
     public static Integer DEPLOY_OTHER_SERVERS = 300;
 
-    public static Integer MODIFY_LOCAL_CLUSTER = 350;
-
     // Module code may depend on schemas, but not vice-versa.
     public static Integer LOAD_SCHEMAS = 350;
 
@@ -70,7 +68,8 @@ public abstract class SortOrderConstants {
     public static Integer DELETE_CERTIFICATE_AUTHORITIES = 9020;
     public static Integer DELETE_EXTERNAL_SECURITY = 9030;
     public static Integer DELETE_PROTECTED_COLLECTIONS = 9040;
-
+    // Amps can reference roles, so must delete amps first
+    public static Integer DELETE_AMPS = 9050;
     // Roles can reference privileges, so must delete roles first
     public static Integer DELETE_ROLES = 9060;
     public static Integer DELETE_PRIVILEGES = 9070;