diff --git a/deploy/lib/server_config.rb b/deploy/lib/server_config.rb
index 02dc13cd..934a7add 100644
--- a/deploy/lib/server_config.rb
+++ b/deploy/lib/server_config.rb
@@ -324,8 +324,8 @@ def self.init
     if !force && !force_config && File.exists?(target_config)
       error_msg << "ml-config.xml has already been created."
     else
-      #create clean marklogic configuration file
-      copy_file sample_config, target_config
+      #create clean marklogic configuration file(s)
+      FileUtils.cp_r sample_config, target_config
     end
 
     raise HelpException.new("init", error_msg.join("\n")) if error_msg.length > 0
@@ -786,11 +786,12 @@ def properties_map
 
   def config
     setup = File.read ServerConfig.expand_path("#{@@path}/lib/xquery/setup.xqy")
+    unresolved = find_arg(['--unresolved']).present?
     query = %Q{
       #{setup}
       try {
         xdmp:quote(
-          setup:rewrite-config(#{get_config}, #{properties_map}, (), fn:true()),
+          setup:rewrite-config(#{get_config(unresolved)}, #{properties_map}, (), fn:#{unresolved}()),
           <options xmlns="xdmp:quote">
             <indent>yes</indent>
             <indent-untyped>yes</indent-untyped>
@@ -1220,6 +1221,50 @@ def deploy
     return true
   end
 
+  def export_config
+    setup = File.read ServerConfig.expand_path("#{@@path}/lib/xquery/setup.xqy")
+    query = %Q{
+      #{setup}
+      try {
+        for $part in setup:split-config(
+          setup:rewrite-config(#{get_config(true)}, map:new(), (), fn:true()),
+          "#{@properties["ml.app-name"]}"
+        )
+        return
+          xdmp:quote(
+            $part,
+            <options xmlns="xdmp:quote">
+              <indent>yes</indent>
+              <indent-untyped>yes</indent-untyped>
+            </options>
+          )
+      } catch($ex) {
+        xdmp:log($ex),
+        fn:concat($ex/err:format-string/text(), '&#10;See MarkLogic Server error log for more details.')
+      }
+    }
+    logger.debug query
+    r = execute_query query
+    logger.debug "code: #{r.code.to_i}"
+
+    r.body = parse_body(r.body)
+    logger.info r.body
+    return true
+  end
+
+  def export
+    what = ARGV.shift
+    raise HelpException.new("export", "Missing WHAT") unless what
+
+    case what
+      when 'config'
+        export_config
+      else
+        raise HelpException.new("export", "Invalid WHAT")
+    end
+    return true
+  end
+
   def load
     dir = ARGV.shift
     db = find_arg(['--db']) || @properties['ml.content-db']
@@ -2457,7 +2502,7 @@ def mlRest
     end
   end
 
-  def get_config
+  def get_config(preserve_props = false)
     if @server_version > 7 && @properties["ml.app-type"] == 'rest' && @properties["ml.url-rewriter"] == "/MarkLogic/rest-api/rewriter.xqy"
       @logger.info "WARN: XQuery REST rewriter has been deprecated since MarkLogic 8"
       @properties["ml.url-rewriter"] = "/MarkLogic/rest-api/rewriter.xml"
@@ -2473,7 +2518,7 @@ def get_config
       @logger.info "      See https://github.com/marklogic/roxy/issues/416 for details."
     end
 
-    @config ||= build_config(@options[:config_file])
+    @config ||= build_config(@options[:config_file], preserve_props)
   end
 
   def execute_query_4(query, properties)
@@ -2778,7 +2823,7 @@ def conditional_prop(prop, default_prop)
 
   def triggers_db_xml
     %Q{
-      <database>
+      <database if-exists="triggers-db" if='triggers-db NE "${modules-db}"' xmlns="http://marklogic.com/xdmp/database">
         <database-name>@ml.triggers-db</database-name>
         <forests>
           <forest-id name="@ml.triggers-db"/>
@@ -2789,7 +2834,7 @@ def triggers_db_xml
 
   def triggers_assignment
     %Q{
-      <assignment>
+      <assignment if-exists="triggers-db" if='triggers-db NE "${modules-db}"' xmlns="http://marklogic.com/xdmp/assignments">
         <forest-name>@ml.triggers-db</forest-name>
       </assignment>
     }
@@ -2798,7 +2843,7 @@ def triggers_assignment
   def xdbc_server
     xdbc_auth_method = conditional_prop('ml.xdbc-authentication-method', 'ml.authentication-method')
     %Q{
-      <xdbc-server>
+      <xdbc-server if-exists="xcc-port" if='xcc-port NE "${app-port}" AND install-xcc NE "false"' xmlns="http://marklogic.com/xdmp/group">
         <xdbc-server-name>@ml.app-name-xcc</xdbc-server-name>
         <port>@ml.xcc-port</port>
         <database name="@ml.content-db"/>
@@ -2811,7 +2856,7 @@ def xdbc_server
   def odbc_server
     odbc_auth_method = conditional_prop('ml.odbc-authentication-method', 'ml.authentication-method')
     %Q{
-      <odbc-server>
+      <odbc-server if-exists="odbc-port" xmlns="http://marklogic.com/xdmp/group">
         <odbc-server-name>@ml.app-name-odbc</odbc-server-name>
         <port>@ml.odbc-port</port>
         <database name="@ml.content-db"/>
@@ -2823,7 +2868,7 @@ def odbc_server
 
   def schemas_db_xml
     %Q{
-      <database>
+      <database if-exists="schemas-db" if='schemas-db NE "${modules-db}"' xmlns="http://marklogic.com/xdmp/database">
         <database-name>@ml.schemas-db</database-name>
         <forests>
           <forest-id name="@ml.schemas-db"/>
@@ -2834,7 +2879,7 @@ def schemas_db_xml
 
   def schemas_assignment
     %Q{
-      <assignment>
+      <assignment if-exists="schemas-db" if='schemas-db NE "${modules-db}"' xmlns="http://marklogic.com/xdmp/assignments">
         <forest-name>@ml.schemas-db</forest-name>
       </assignment>
     }
@@ -2842,7 +2887,7 @@ def schemas_assignment
 
   def test_content_db_xml
     %Q{
-      <database import="@ml.content-db">
+      <database if-exists="test-port AND test-content-db" if='environment NE "prod" AND test-content-db NE "${content-db}"' import="@ml.content-db" xmlns="http://marklogic.com/xdmp/database">
         <database-name>@ml.test-content-db</database-name>
         <forests>
           <forest-id name="@ml.test-content-db"/>
@@ -2853,7 +2898,7 @@ def test_content_db_xml
 
   def test_content_db_assignment
     %Q{
-      <assignment>
+      <assignment if-exists="test-port AND test-content-db" if='environment NE "prod" AND test-content-db NE "${content-db}"' xmlns="http://marklogic.com/xdmp/assignments">
         <forest-name>@ml.test-content-db</forest-name>
       </assignment>
     }
@@ -2866,7 +2911,7 @@ def test_appserver
     test_default_user = conditional_prop('ml.test-default-user', 'ml.default-user')
 
     %Q{
-      <http-server import="@ml.app-name">
+      <http-server if-exists="test-port" if='environment NE "prod"' import="@ml.app-name" xmlns="http://marklogic.com/xdmp/group">
         <http-server-name>@ml.app-name-test</http-server-name>
         <port>@ml.test-port</port>
         <database name="@ml.test-content-db"/>
@@ -2879,7 +2924,7 @@ def test_appserver
 
   def test_modules_db_xml
     %Q{
-      <database import="@ml.modules-db">
+      <database if-exists="test-port AND test-modules-db" if='environment NE "prod" AND test-modules-db NE "${modules-db}"' import="@ml.modules-db" xmlns="http://marklogic.com/xdmp/database">
         <database-name>@ml.test-modules-db</database-name>
         <forests>
           <forest-id name="@ml.test-modules-db"/>
@@ -2888,9 +2933,17 @@ def test_modules_db_xml
     }
   end
 
+  def test_modules_db_assignment
+    %Q{
+      <assignment if-exists="test-port AND test-modules-db" if='environment NE "prod" AND test-modules-db NE "${modules-db}"' xmlns="http://marklogic.com/xdmp/assignments">
+        <forest-name>@ml.test-modules-db</forest-name>
+      </assignment>
+    }
+  end
+
   def test_user_xml
     %Q{
-      <user>
+      <user if-exists="test-user" xmlns="http://marklogic.com/xdmp/security">
         <user-name>${test-user}</user-name>
         <description>A user for the ${app-name} unit tests</description>
         <password>${test-user-password}</password>
@@ -2903,14 +2956,6 @@ def test_user_xml
     }
   end
 
-  def test_modules_db_assignment
-    %Q{
-      <assignment>
-        <forest-name>@ml.test-modules-db</forest-name>
-      </assignment>
-    }
-  end
-
   def rest_appserver
     rest_modules_db = conditional_prop('ml.rest-modules-db', 'ml.modules-db')
     rest_auth_method = conditional_prop('ml.rest-authentication-method', 'ml.authentication-method')
@@ -2926,7 +2971,7 @@ def rest_appserver
     end
 
     %Q{
-      <http-server import="@ml.app-name">
+      <http-server if-exists="rest-port" import="@ml.app-name" xmlns="http://marklogic.com/xdmp/group">
         <http-server-name>@ml.app-name-rest</http-server-name>
         <port>@ml.rest-port</port>
         <database name="@ml.content-db"/>
@@ -2944,7 +2989,7 @@ def rest_modules_db_xml
     rest_modules_db = conditional_prop('ml.rest-modules-db', 'ml.modules-db')
 
     %Q{
-      <database>
+      <database if-exists="rest-port" if='rest-modules-db NE "${modules-db}"' xmlns="http://marklogic.com/xdmp/database">
         <database-name>#{rest_modules_db}</database-name>
         <forests>
           <forest-id name="#{rest_modules_db}"/>
@@ -2957,7 +3002,7 @@ def rest_modules_db_assignment
     rest_modules_db = conditional_prop('ml.rest-modules-db', 'ml.modules-db')
 
     %Q{
-      <assignment>
+      <assignment if-exists="rest-port" if='rest-modules-db NE "${modules-db}"' xmlns="http://marklogic.com/xdmp/assignments">
         <forest-name>#{rest_modules_db}</forest-name>
       </assignment>
     }
@@ -2965,7 +3010,7 @@ def rest_modules_db_assignment
 
   def ssl_certificate_xml
     %Q{
-      <certificate>
+      <certificate if-exists="ssl-certificate-template" xmlns="http://marklogic.com/xdmp/pki">
         <name>@ml.ssl-certificate-template</name>
         <countryName>@ml.ssl-certificate-countryName</countryName>
         <stateOrProvinceName>@ml.ssl-certificate-stateOrProvinceName</stateOrProvinceName>
@@ -2977,152 +3022,174 @@ def ssl_certificate_xml
     }
   end
 
-  def build_config(config_files)
+  def build_config(config_paths, preserve_props = false)
+    # some extra assertions
+    raise ExitException.new("You must use different numbers for app-port and rest-port.") if @properties["ml.app-port"] == @properties["ml.rest-port"]
+    raise ExitException.new("You must use different numbers for app-port and odbc-port.") if @properties["ml.app-port"] == @properties["ml.odbc-port"]
+    raise ExitException.new("You must use different numbers for app-port and xdbc-port.") if @properties["ml.app-port"] == @properties["ml.xdbc-port"]
+    raise ExitException.new("You must use different numbers for app-port and test-port.") if @properties["ml.app-port"] == @properties["ml.test-port"]
+    
+    config_files = []
+    config_paths.split(",").each do |config_path|
+      if File.directory?(config_path)
+        Dir.glob(File.join(config_path, '**', '*')).reject {
+          |p| File.directory? p
+        }.each do |file|
+          config_files.push file
+        end
+      else
+        config_files.push config_path
+      end
+    end
+
     configs = []
-    config_files.split(",").each do |config_file|
+    config_files.each do |config_file|
       config = File.read(config_file)
 
       # Build the triggers db if it is provided
-      if @properties['ml.triggers-db'].present?
+      #if @properties['ml.triggers-db'].present?
 
-        if @properties['ml.triggers-db'] != @properties['ml.modules-db']
+        #if @properties['ml.triggers-db'] != @properties['ml.modules-db']
           config.gsub!("@ml.triggers-db-xml", triggers_db_xml)
           config.gsub!("@ml.triggers-assignment", triggers_assignment)
-        else
-          config.gsub!("@ml.triggers-db-xml", "")
-          config.gsub!("@ml.triggers-assignment", "")
-        end
+        #else
+        #  config.gsub!("@ml.triggers-db-xml", "")
+        #  config.gsub!("@ml.triggers-assignment", "")
+        #end
 
         config.gsub!("@ml.triggers-mapping",
           %Q{
-          <triggers-database name="@ml.triggers-db"/>
+          <triggers-database if-exists="triggers-db" name="@ml.triggers-db"/>
           })
 
-      else
-        config.gsub!("@ml.triggers-db-xml", "")
-        config.gsub!("@ml.triggers-assignment", "")
-        config.gsub!("@ml.triggers-mapping", "")
-      end
+      #else
+      #  config.gsub!("@ml.triggers-db-xml", "")
+      #  config.gsub!("@ml.triggers-assignment", "")
+      #  config.gsub!("@ml.triggers-mapping", "")
+      #end
 
-      if @properties['ml.xcc-port'].present? and @properties['ml.install-xcc'] != 'false'
+      #if @properties['ml.xcc-port'].present? and @properties['ml.install-xcc'] != 'false'
         config.gsub!("@ml.xdbc-server", xdbc_server)
-      else
-        config.gsub!("@ml.xdbc-server", "")
-      end
+      #else
+      #  config.gsub!("@ml.xdbc-server", "")
+      #end
 
-      if @properties['ml.odbc-port'].present?
+      #if @properties['ml.odbc-port'].present?
         config.gsub!("@ml.odbc-server", odbc_server)
-      else
-        config.gsub!("@ml.odbc-server", "")
-      end
+      #else
+      #  config.gsub!("@ml.odbc-server", "")
+      #end
 
       # Build the schemas db if it is provided
-      if @properties['ml.schemas-db'].present?
+      #if @properties['ml.schemas-db'].present?
 
-        if @properties['ml.schemas-db'] != @properties['ml.modules-db']
+        #if @properties['ml.schemas-db'] != @properties['ml.modules-db']
           config.gsub!("@ml.schemas-db-xml", schemas_db_xml)
           config.gsub!("@ml.schemas-assignment", schemas_assignment)
-        else
-          config.gsub!("@ml.schemas-db-xml", "")
-          config.gsub!("@ml.schemas-assignment", "")
-        end
+        #else
+        #  config.gsub!("@ml.schemas-db-xml", "")
+        #  config.gsub!("@ml.schemas-assignment", "")
+        #end
 
         config.gsub!("@ml.schemas-mapping",
           %Q{
-          <schema-database name="@ml.schemas-db"/>
+          <schema-database if-exists="schemas-db" name="@ml.schemas-db"/>
           })
 
-      else
-        config.gsub!("@ml.schemas-db-xml", "")
-        config.gsub!("@ml.schemas-assignment", "")
-        config.gsub!("@ml.schemas-mapping", "")
-      end
+      #else
+      #  config.gsub!("@ml.schemas-db-xml", "")
+      #  config.gsub!("@ml.schemas-assignment", "")
+      #  config.gsub!("@ml.schemas-mapping", "")
+      #end
 
       # Build the test appserver and db if it is provided
-      if @properties['ml.test-content-db'].present? &&
-         @properties['ml.test-port'].present? &&
-         @environment != "prod"
+      #if @properties['ml.test-content-db'].present? &&
+      #   @properties['ml.test-port'].present? &&
+      #   @environment != "prod"
 
         config.gsub!("@ml.test-content-db-xml", test_content_db_xml)
         config.gsub!("@ml.test-content-db-assignment", test_content_db_assignment)
         config.gsub!("@ml.test-appserver", test_appserver)
 
-      else
-        config.gsub!("@ml.test-content-db-xml", "")
-        config.gsub!("@ml.test-content-db-assignment", "")
-        config.gsub!("@ml.test-appserver", "")
-      end
+      #else
+      #  config.gsub!("@ml.test-content-db-xml", "")
+      #  config.gsub!("@ml.test-content-db-assignment", "")
+      #  config.gsub!("@ml.test-appserver", "")
+      #end
 
       # Build the test modules db if it is different from the app modules db
-      if @properties['ml.test-modules-db'].present? &&
-         @properties['ml.test-modules-db'] != @properties['ml.modules-db']
+      #if @properties['ml.test-modules-db'].present? &&
+      #   @properties['ml.test-modules-db'] != @properties['ml.modules-db']
 
         config.gsub!("@ml.test-modules-db-xml", test_modules_db_xml)
         config.gsub!("@ml.test-modules-db-assignment", test_modules_db_assignment)
 
-      else
-        config.gsub!("@ml.test-modules-db-xml", "")
-        config.gsub!("@ml.test-modules-db-assignment", "")
-      end
+      #else
+      #  config.gsub!("@ml.test-modules-db-xml", "")
+      #  config.gsub!("@ml.test-modules-db-assignment", "")
+      #end
 
-      if @properties['ml.test-user'].present?
+      #if @properties['ml.test-user'].present?
 
         config.gsub!("@ml.test-user-xml", test_user_xml)
 
-      else
-        config.gsub!("@ml.test-user-xml", "")
-      end
+      #else
+      #  config.gsub!("@ml.test-user-xml", "")
+      #end
 
-      if @properties['ml.rest-port'].present?
+      #if @properties['ml.rest-port'].present?
 
         # Set up a REST API app server, distinct from the main application.
         config.gsub!("@ml.rest-appserver", rest_appserver)
 
-        if @properties['ml.rest-modules-db'].present? &&
-           @properties['ml.rest-modules-db'] != @properties['ml.modules-db']
+        #if @properties['ml.rest-modules-db'].present? &&
+        #   @properties['ml.rest-modules-db'] != @properties['ml.modules-db']
            config.gsub!("@ml.rest-modules-db-xml", rest_modules_db_xml)
            config.gsub!("@ml.rest-modules-db-assignment", rest_modules_db_assignment)
-        else
-          config.gsub!("@ml.rest-modules-db-xml", "")
-          config.gsub!("@ml.rest-modules-db-assignment", "")
-        end
-
-      else
-        config.gsub!("@ml.rest-appserver", "")
-        config.gsub!("@ml.rest-modules-db-xml", "")
-        config.gsub!("@ml.rest-modules-db-assignment", "")
-      end
-
-      if @properties['ml.forest-data-dir'].present?
+        #else
+        #  config.gsub!("@ml.rest-modules-db-xml", "")
+        #  config.gsub!("@ml.rest-modules-db-assignment", "")
+        #end
+
+      #else
+      #  config.gsub!("@ml.rest-appserver", "")
+      #  config.gsub!("@ml.rest-modules-db-xml", "")
+      #  config.gsub!("@ml.rest-modules-db-assignment", "")
+      #end
+
+      #if @properties['ml.forest-data-dir'].present?
         config.gsub!("@ml.forest-data-dir-xml",
           %Q{
-            <data-directory>@ml.forest-data-dir</data-directory>
+            <data-directory if-exists="forest-data-dir">@ml.forest-data-dir</data-directory>
           })
-      else
-        config.gsub!("@ml.forest-data-dir-xml", "")
-      end
+      #else
+      #  config.gsub!("@ml.forest-data-dir-xml", "")
+      #end
 
-      if !@properties['ml.rewrite-resolves-globally'].nil?
+      #if !@properties['ml.rewrite-resolves-globally'].nil?
         config.gsub!("@ml.rewrite-resolves-globally",
           %Q{
-            <rewrite-resolves-globally>#{@properties['ml.rewrite-resolves-globally']}</rewrite-resolves-globally>
+            <rewrite-resolves-globally if-exists="rewrite-resolves-globally">@ml.rewrite-resolves-globally</rewrite-resolves-globally>
+            <rewrite-resolves-globally if-not-exists="rewrite-resolves-globally" if='app-type EQ "rest" OR app-type EQ hybrid'>true</rewrite-resolves-globally>
           })
-      elsif ['rest', 'hybrid'].include?(@properties["ml.app-type"])
-        config.gsub!("@ml.rewrite-resolves-globally",
-          %Q{
-            <rewrite-resolves-globally>true</rewrite-resolves-globally>
-          })
-      else
-        config.gsub!("@ml.rewrite-resolves-globally", "")
-      end
-
-      if @properties['ml.ssl-certificate-template'].present?
+      #elsif ['rest', 'hybrid'].include?(@properties["ml.app-type"])
+      #  config.gsub!("@ml.rewrite-resolves-globally",
+      #    %Q{
+      #      <rewrite-resolves-globally>true</rewrite-resolves-globally>
+      #    })
+      #else
+      #  config.gsub!("@ml.rewrite-resolves-globally", "")
+      #end
+
+      #if @properties['ml.ssl-certificate-template'].present?
         config.gsub!("@ml.ssl-certificate-xml", ssl_certificate_xml)
-      else
-        config.gsub!("@ml.ssl-certificate-xml", "")
-      end
+      #else
+      #  config.gsub!("@ml.ssl-certificate-xml", "")
+      #end
 
-      replace_properties(config, File.basename(config_file), true)
+      if ! preserve_props
+        replace_properties(config, File.basename(config_file), true)
+      end
 
       # escape unresolved braces, they have special meaning in XQuery
       config.gsub!("{", "{{")
diff --git a/deploy/lib/xquery/setup.xqy b/deploy/lib/xquery/setup.xqy
index 5f955d5e..be4c5faa 100644
--- a/deploy/lib/xquery/setup.xqy
+++ b/deploy/lib/xquery/setup.xqy
@@ -434,7 +434,7 @@ declare variable $cts:parse             := fn:function-lookup(xs:QName("cts:pars
 declare variable $if-parser := ();
 
 declare function setup:get-if-parser($properties as map:map) {
-  if ($if-parser) then
+  if (fn:exists($if-parser)) then
     $if-parser
   else
     let $parser := function($query) {
@@ -469,44 +469,88 @@ declare function setup:get-if-parser($properties as map:map) {
 };
 
 declare function setup:eval-query($query as cts:query, $properties as map:map) {
-    typeswitch ($query)
-    case cts:and-query return fn:not(
-      (cts:and-query-queries($query) ! setup:eval-query(., $properties)) = fn:false()
-    )
-    case cts:or-query return (
-      (cts:or-query-queries($query) ! setup:eval-query(., $properties)) = fn:true()
-    )
-    case cts:not-query return fn:not(
-      cts:not-query-query($query) ! setup:eval-query(., $properties)
-    )
-    case cts:element-value-query return (
-      let $property := fn:string(cts:element-value-query-element-name($query))
-      let $operator := '='
-      let $values := cts:element-value-query-text($query)
-      return map:get($properties, $property) = $values
-    )
-    case cts:element-word-query return (
-      let $property := fn:string(cts:element-word-query-element-name($query))
-      let $operator := '='
-      let $values := cts:element-word-query-text($query)
-      return map:get($properties, $property) = $values
-    )
-    case cts:element-range-query return (
-      let $property := fn:string(cts:element-range-query-element-name($query))
-      let $operator := cts:element-range-query-operator($query)
-      let $values := cts:element-range-query-value($query)
+  typeswitch ($query)
+  case cts:and-query return fn:not(
+    (cts:and-query-queries($query) ! setup:eval-query(., $properties)) = fn:false()
+  )
+  case cts:or-query return (
+    (cts:or-query-queries($query) ! setup:eval-query(., $properties)) = fn:true()
+  )
+  case cts:not-query return fn:not(
+    cts:not-query-query($query) ! setup:eval-query(., $properties)
+  )
+  case cts:element-value-query return (
+    let $property := fn:string(cts:element-value-query-element-name($query))
+    let $operator := '='
+    let $values := cts:element-value-query-text($query)
+    return map:get($properties, $property) = $values
+  )
+  case cts:element-word-query return (
+    let $property := fn:string(cts:element-word-query-element-name($query))
+    let $operator := '='
+    let $values := cts:element-word-query-text($query)
+    return map:get($properties, $property) = $values
+  )
+  case cts:element-range-query return (
+    let $property := fn:string(cts:element-range-query-element-name($query))
+    let $operator := cts:element-range-query-operator($query)
+    let $values := cts:element-range-query-value($query)
+    return
+      if ($operator = ('=', '!=', '>', '>=', '<', '<=')) then
+        xdmp:value("map:get($properties, $property) " || $operator || " $values")
+      else
+        fn:error(xs:QName("UNSUPPORTED"), "Unsupported operator " || $operator)
+  )
+  case cts:word-query return (
+    fn:error(xs:QName("SYNTAX"), "Syntax error near " || cts:word-query-text($query))
+  )
+  default return (
+    fn:error(xs:QName("UNSUPPORTED"), "Cannot parse " || fn:upper-case(fn:replace(fn:string(xdmp:type($query)), "-query$", "")))
+  )
+};
+
+declare function setup:eval-conditionals($attrs, $properties) {
+  (: process conditional attrs in doc order, and stop at first failure :)
+  let $attr := fn:head($attrs)
+  let $remainder := fn:tail($attrs)
+  let $res :=
+    typeswitch($attr)
+    case attribute(if) return
+      let $parser := setup:get-if-parser($properties)
+      let $expression := fn:string($attr)
+      return try {
+        let $query := $parser($expression)[1]
+        return try {
+          setup:eval-query($query, $properties)
+        } catch ($e) {
+          fn:error(xs:QName("IF-PARSE-ERROR"),
+            "Unable to evauluate the expression '" || $expression || "': " || $e/error:format-string/fn:string())
+        }
+      } catch ($e) {
+        fn:error(xs:QName("IF-PARSE-ERROR"),
+          "Unable to parse the expression '" || $expression || "': " || $e/error:format-string/fn:string())
+      }
+    case attribute(if-exists) return fn:not(
+      for $prop in fn:tokenize(fn:string($attr), "\s+AND\s+")
       return
-        if ($operator = ('=', '!=', '>', '>=', '<', '<=')) then
-          xdmp:value("map:get($properties, $property) " || $operator || " $values")
-        else
-          fn:error(xs:QName("UNSUPPORTED"), "Unsupported operator " || $operator)
+        fn:exists(map:get($properties, "ml." || $prop)[. != ''])
+      = fn:false()
     )
-    case cts:word-query return (
-      fn:error(xs:QName("SYNTAX"), "Syntax error near " || cts:word-query-text($query))
-    )
-    default return (
-      fn:error(xs:QName("UNSUPPORTED"), "Cannot parse " || fn:upper-case(fn:replace(fn:string(xdmp:type($query)), "-query$", "")))
+    case attribute(if-not-exists) return fn:not(
+      for $prop in fn:tokenize(fn:string($attr), "\s+AND\s+")
+      return
+        fn:empty(map:get($properties, "ml." || $prop)[. != ''])
+      = fn:false()
     )
+    default return
+      fn:true()
+  return
+    if (fn:empty($remainder)) then
+      $res
+    else if ($res) then
+      setup:eval-conditionals($remainder, $properties)
+    else
+      fn:false()
 };
 
 declare function setup:process-conditionals($nodes, $properties) {
@@ -515,29 +559,20 @@ declare function setup:process-conditionals($nodes, $properties) {
     typeswitch ($node)
     case element() return
       let $if-valid :=
-        if (fn:exists($node/@if)) then
-          let $parser := setup:get-if-parser($properties)
-          let $expression := string($node/@if)
-          return try {
-            let $query := $parser($expression)[1]
-            return try {
-              setup:eval-query($query, $properties)
-            } catch ($e) {
-              fn:error(xs:QName("IF-PARSE-ERROR"),
-                "Unable to evauluate the expression '" || $expression || "': " || $e/error:format-string/data())
-            }
-          } catch ($e) {
-            fn:error(xs:QName("IF-PARSE-ERROR"),
-              "Unable to parse the expression '" || $expression || "': " || $e/error:format-string/data())
-          }
+        if (fn:exists($node/(@if-exists, @if-not-exists, @if))) then
+          setup:eval-conditionals($node/(@if-exists, @if-not-exists, @if), $properties)
         else
           fn:true()
       where $if-valid
-      return element { fn:node-name($node) } {
-        $node/@*,
-        setup:process-conditionals($node/node(), $properties)
-      }
-    case comment() return ()
+      return
+        if ($node/self::*:if) then
+          (: unwrap `if` elements :)
+          setup:process-conditionals($node/node(), $properties)
+        else
+          element { fn:node-name($node) } {
+            $node/(@* except (@if, @if-exists, @if-not-exists)),
+            setup:process-conditionals($node/node(), $properties)
+          }
     default return $node
 };
 
@@ -571,6 +606,67 @@ declare function setup:unique-attributes($attrs) {
   return map:keys($result) ! map:get($result, .)
 };
 
+declare function setup:wrap-config-fragments($fragments) {
+  if (fn:exists($fragments)) then
+    <configuration>
+      <hosts xmlns="http://marklogic.com/xdmp/hosts">{
+        setup:unique-attributes($fragments/self::ho:hosts/@*),
+        $fragments/self::ho:hosts/*,
+        $fragments/self::ho:host
+      }</hosts>
+      <assignments xmlns="http://marklogic.com/xdmp/assignments">{
+        setup:unique-attributes($fragments/self::as:assignments/@*),
+        $fragments/self::as:assignments/*,
+        $fragments/self::as:assignment
+      }</assignments>
+      <databases xmlns="http://marklogic.com/xdmp/database">{
+        setup:unique-attributes($fragments/self::db:databases/@*),
+        $fragments/self::db:databases/*,
+        $fragments/self::db:database
+      }</databases>
+      <certificates xmlns="http://marklogic.com/xdmp/pki">{
+        setup:unique-attributes($fragments/self::pki:certificates/@*),
+        $fragments/self::pki:certificates/*,
+        $fragments/self::pki:certificate
+      }</certificates>
+      <roles xmlns="http://marklogic.com/xdmp/security">{
+        setup:unique-attributes($fragments/self::sec:roles/@*),
+        $fragments/self::sec:roles/*,
+        $fragments/self::sec:role
+      }</roles>
+      <users xmlns="http://marklogic.com/xdmp/security">{
+        setup:unique-attributes($fragments/self::sec:users/@*),
+        $fragments/self::sec:users/*,
+        $fragments/self::sec:user
+      }</users>
+      <amps xmlns="http://marklogic.com/xdmp/security">{
+        setup:unique-attributes($fragments/self::sec:amps/@*),
+        $fragments/self::sec:amps/*,
+        $fragments/self::sec:amp
+      }</amps>
+      <privileges xmlns="http://marklogic.com/xdmp/security">{
+        setup:unique-attributes($fragments/self::sec:privileges/@*),
+        $fragments/self::sec:privileges/*,
+        $fragments/self::sec:privilege
+      }</privileges>
+      <mimetypes xmlns="http://marklogic.com/xdmp/mimetypes">{
+        setup:unique-attributes($fragments/self::mt:mimetypes/@*),
+        $fragments/self::mt:mimetypes/*,
+        $fragments/self::mt:mimetype
+      }</mimetypes>
+      <external-securities xmlns="http://marklogic.com/xdmp/security">{
+        setup:unique-attributes($fragments/self::sec:external-securities/@*),
+        $fragments/self::sec:external-securities/*,
+        $fragments/self::sec:external-security
+      }</external-securities>
+      <credentials xmlns="http://marklogic.com/xdmp/security">{
+        setup:unique-attributes($fragments/self::sec:credentials/@*),
+        $fragments/self::sec:credentials/*
+      }</credentials>
+    </configuration>/*
+  else ()
+};
+
 (: for backwards-compatibility :)
 declare function setup:rewrite-config($import-configs as node()+, $properties as map:map) as element(configuration)
 {
@@ -582,32 +678,51 @@ declare function setup:rewrite-config($import-configs as node()+, $properties as
   setup:rewrite-config($import-configs, $properties, $silent, ())
 };
 
-declare function setup:rewrite-config($import-configs as node()+, $properties as map:map, $silent as xs:boolean?, $keep-comments as xs:boolean?) as element(configuration)
+declare function setup:rewrite-config($import-configs as node()+, $properties as map:map, $silent as xs:boolean?, $unresolved as xs:boolean?) as element(configuration)
 {
-  let $import-configs := setup:process-conditionals($import-configs, $properties)
+  let $import-configs :=
+    if ($unresolved) then
+      $import-configs
+    else
+      setup:process-conditionals($import-configs, $properties)
   let $config :=
-    element { fn:node-name($import-configs[1]) } {
-      setup:unique-attributes($import-configs/@*),
+    element configuration {
+      setup:unique-attributes($import-configs/self::configuration/@*),
 
       (: capture comments before gr:groups, and its older counterparts :)
-      $import-configs/(
+      $import-configs/self::configuration/(
         gr:groups, gr:http-servers, gr:xdbc-servers, gr:odbc-servers, gr:task-server
       )/preceding-sibling::node(),
 
       <groups xmlns="http://marklogic.com/xdmp/group">{
         setup:unique-attributes($import-configs/gr:groups/@*),
 
-        let $default-group := ($import-configs/@default-group, "Default")[1]
-        for $group in fn:distinct-values(
-          ($import-configs/gr:groups/gr:group/gr:group-name, $import-configs/(gr:http-servers/gr:http-server, gr:xdbc-servers/gr:xdbc-server,
-            gr:odbc-servers/gr:odbc-server, gr:task-server, db:databases/db:database)/@group, $default-group))
-        let $http-servers := $import-configs/gr:http-servers/gr:http-server[@group = $group or ($group = $default-group and fn:empty(@group))]
-        let $xdbc-servers := $import-configs/gr:xdbc-servers/gr:xdbc-server[@group = $group or ($group = $default-group and fn:empty(@group))]
-        let $odbc-servers := $import-configs/gr:odbc-servers/gr:odbc-server[@group = $group or ($group = $default-group and fn:empty(@group))]
-        let $task-server := $import-configs/gr:task-server[@group = $group or ($group = $default-group and fn:empty(@group))]
+        let $default-group := ($import-configs/self::*:configuration/@default-group, "Default")[1]
+        for $group in fn:distinct-values((
+          $import-configs/descendant-or-self::gr:group/gr:group-name/fn:string(),
+          $import-configs/descendant-or-self::*/(
+            self::gr:http-server, self::gr:xdbc-server,
+            self::gr:odbc-server, self::gr:task-server, self::db:database
+          )/@group,
+          $default-group
+        ))
+        let $http-servers := $import-configs/descendant-or-self::gr:http-server[
+          @group = $group or ( $group = $default-group and fn:empty(@group) )
+        ]
+        let $xdbc-servers := $import-configs/descendant-or-self::gr:xdbc-server[
+          @group = $group or ( $group = $default-group and fn:empty(@group) )
+        ]
+        let $odbc-servers := $import-configs/descendant-or-self::gr:odbc-server[
+          @group = $group or ( $group = $default-group and fn:empty(@group) )
+        ]
+        let $task-server := $import-configs/descendant-or-self::gr:task-server[
+          @group = $group or ( $group = $default-group and fn:empty(@group) )
+        ]
         let $servers := ($http-servers, $xdbc-servers, $odbc-servers, $task-server)
-        let $databases := $import-configs/db:databases/db:database[@group = $group or ($group = $default-group and fn:empty(@group))]
-        let $group-config := $import-configs/gr:groups/gr:group[gr:group-name = $group]
+        let $databases := $import-configs/descendant-or-self::db:database[
+          @group = $group or ( $group = $default-group and fn:empty(@group) )
+        ]
+        let $group-config := $import-configs/descendant-or-self::gr:group[gr:group-name/fn:string() = $group]
         where fn:exists($servers | $databases | $group-config)
         return
           <group>
@@ -632,21 +747,31 @@ declare function setup:rewrite-config($import-configs as node()+, $properties as
       }</groups>,
 
       (: capture anything following gr:groups, and its older counterparts :)
-      $import-configs/(
+      $import-configs/self::*:configuration/(
         gr:groups, gr:http-servers, gr:xdbc-servers, gr:odbc-servers, gr:task-server
       )/following-sibling::node(),
 
-      (: other fragments with configuration as root :)
-      $import-configs[fn:empty((
-        gr:groups, gr:http-servers, gr:xdbc-servers, gr:odbc-servers, gr:task-server
-      ))]/node()
+      (: in case of config fragments, merge and wrap them :)
+      setup:wrap-config-fragments((
+        (: fragments with configuration as root :)
+        $import-configs/self::*:configuration[fn:empty((
+          gr:groups, gr:http-servers, gr:xdbc-servers, gr:odbc-servers, gr:task-server
+        ))]/node(),
+
+        (: other fragments :)
+        $import-configs[fn:not(self::*:configuration)]/(self::node() except (
+          self::gr:groups, self::gr:group, self::gr:http-servers, self::gr:http-server,
+          self::gr:xdbc-servers, self::gr:xdbc-server, self::gr:odbc-servers, self::gr:odbc-server,
+          self::gr:task-server
+        ))
+      ))
     }
 
   (: Check config on group consistency! :)
   let $_ :=
-    if ($silent) then ()
+    if ($silent or $unresolved) then ()
     else
-      for $group in $config/gr:groups/gr:group/gr:group-name
+      for $group in $config/gr:groups/gr:group/gr:group-name/fn:string()
       let $hosts := ($config/ho:hosts/ho:host[ho:group/@name = $group], try { xdmp:group-hosts(xdmp:group($group)) } catch ($ignore) {})
       where fn:empty($hosts)
       return
@@ -656,9 +781,46 @@ declare function setup:rewrite-config($import-configs as node()+, $properties as
         )
 
   (: all good :)
-  return  if ($keep-comments) then $config else setup:suppress-comments($config)
+  return  if ($unresolved) then $config else setup:suppress-comments($config)
 };
 
+declare function setup:split-config($config as element(configuration), $app-name as xs:string) as node()* {
+  for $part in (
+    $config/*/*,
+    $config/gr:groups/gr:group/(
+      (gr:http-servers, gr:xdbc-servers, gr:odbc-servers)/*,
+      gr:task-server
+    )
+  )
+  let $type := fn:local-name($part)
+
+  let $name :=
+    if ($part instance of element(gr:task-server)) then
+      "TaskServer"
+    else
+      $part/*[local-name() = ("name", "forest-name", "local-name", concat($type, "-name"))][1]
+           /fn:replace(fn:replace(fn:string(), "^(.*/)?([^/]+)", "$2"), "^\$\{group\}$", "default-group")
+
+  let $path := fn:replace(fn:replace($type, "(http|xdbc|odbc|task)-", "") || "s", "ys$", "ies")
+  let $path :=
+    if (fn:contains(fn:namespace-uri($part), "security")) then
+      "security/" || $path
+    else
+      fn:replace($path, "assignments/", "forests/")
+
+  let $file := fn:replace($name, "(@ml.|[${}])", "") || ".xml"
+
+  return (
+    comment { "SAVE-PART-AS:" || $path || "/" || $file },
+    typeswitch ($part)
+    case element(gr:group)
+      return element gr:group {
+        $part/@*,
+        $part/(node() except (gr:http-servers, gr:xdbc-servers, gr:odbc-servers, gr:task-server))
+      }
+    default return $part
+  )
+};
 
 (:
   base-name : Original forest base name - this should be the name from the config.
@@ -3048,19 +3210,21 @@ declare function setup:add-geospatial-path-indexes(
   $database as xs:unsignedLong,
   $db-config as element(db:database)) as element(configuration)
 {
-  admin:database-add-geospatial-path-index(
-    $admin-config,
-    $database,
-    for $index in $db-config/db:geospatial-path-indexes/db:geospatial-path-index
-    return
-      if (setup:at-least-version("8.0-0")) then
-        xdmp:value("
-          admin:database-geospatial-path-index(
-            $index/db:path-expression,
-            $index/db:coordinate-system,
-            $index/db:range-value-positions,
-            ($index/db:point-format, ""point"")[1],
-            ($index/db:invalid-values, $default-invalid-values)[1]
+  if (exists($db-config/db:geospatial-path-indexes/db:geospatial-path-index)) then
+    if (setup:at-least-version("8.0-0")) then
+      xdmp:value("
+        admin:database-add-geospatial-path-index(
+          $admin-config,
+          $database,
+          for $index in $db-config/db:geospatial-path-indexes/db:geospatial-path-index
+          return
+            admin:database-geospatial-path-index(
+              $index/db:path-expression,
+              $index/db:coordinate-system,
+              $index/db:range-value-positions,
+              ($index/db:point-format, ""point"")[1],
+              ($index/db:invalid-values, $default-invalid-values)[1]
+            )
           )
         ")
       else
@@ -3068,7 +3232,8 @@ declare function setup:add-geospatial-path-indexes(
           xs:QName("VERSION_NOT_SUPPORTED"),
           "Roxy does not support geospatial path indexes for this version of MarkLogic. Use 8.0-0 or later."
         )
-  )
+  else
+    $admin-config
 };
 
 declare function setup:validate-geospatial-path-indexes(
@@ -3109,27 +3274,30 @@ declare function setup:add-geospatial-region-path-indexes(
   $database as xs:unsignedLong,
   $db-config as element(db:database)) as element(configuration)
 {
-  admin:database-add-geospatial-region-path-index(
-    $admin-config,
-    $database,
-    for $index in $db-config/db:geospatial-region-path-indexes/db:geospatial-region-path-index
-    return
-      if (setup:at-least-version("9.0-0")) then
-        xdmp:value("
-          admin:database-geospatial-region-path-index(
-            $index/db:path-expression,
-            $index/db:coordinate-system,
-            $index/db:geohash-precision,
-            ($index/db:invalid-values, $default-invalid-values)[1],
-            ($index/db:units, ""miles"")[1]
-          )
-        ")
-      else
-        fn:error(
-          xs:QName("VERSION_NOT_SUPPORTED"),
-          "Roxy does not support geospatial region path indexes for this version of MarkLogic. Use 9.0-0 or later."
+  if (exists($db-config/db:geospatial-region-path-indexes/db:geospatial-region-path-index)) then
+    if (setup:at-least-version("9.0-0")) then
+      xdmp:value("
+        admin:database-add-geospatial-region-path-index(
+          $admin-config,
+          $database,
+          for $index in $db-config/db:geospatial-region-path-indexes/db:geospatial-region-path-index
+          return
+            admin:database-geospatial-region-path-index(
+              $index/db:path-expression,
+              $index/db:coordinate-system,
+              $index/db:geohash-precision,
+              ($index/db:invalid-values, $default-invalid-values)[1],
+              ($index/db:units, ""miles"")[1]
+            )
         )
-  )
+      ")
+    else
+      fn:error(
+        xs:QName("VERSION_NOT_SUPPORTED"),
+        "Roxy does not support geospatial region path indexes for this version of MarkLogic. Use 9.0-0 or later."
+      )
+  else
+    $admin-config
 };
 
 declare function setup:validate-geospatial-region-path-indexes(
diff --git a/deploy/sample/ml-config.sample/databases/content-db.xml b/deploy/sample/ml-config.sample/databases/content-db.xml
new file mode 100644
index 00000000..adeec9ce
--- /dev/null
+++ b/deploy/sample/ml-config.sample/databases/content-db.xml
@@ -0,0 +1,231 @@
+    <!--Application Database Configuration-->
+    <database xmlns="http://marklogic.com/xdmp/database">
+      <database-name>${content-db}</database-name>
+      <forests-per-host>${content-forests-per-host}</forests-per-host>
+      @ml.schemas-mapping
+      @ml.triggers-mapping
+      <forests>
+        <forest-id name="${content-db}"/>
+        @ml.forest-data-dir-xml
+      </forests>
+
+      <!-- See sample/default-docs-config.sample.xml for default settings and indexes of Documents database -->
+
+      <uri-lexicon>true</uri-lexicon>
+      <collection-lexicon>true</collection-lexicon>
+      <directory-creation>manual</directory-creation>
+      <maintain-last-modified>false</maintain-last-modified>
+<!--
+      <fragment-roots>
+        <fragment-root>
+          <namespace-uri>http://www.marklogic.com/ns/sample</namespace-uri>
+          <localname>frag-root</localname>
+        </fragment-root>
+      </fragment-roots>
+      <fragment-parents>
+        <fragment-parent>
+          <namespace-uri>http://www.marklogic.com/ns/sample</namespace-uri>
+          <localname>frag-parents</localname>
+        </fragment-parent>
+      </fragment-parents>
+-->
+<!--
+      <fields>
+        <field>
+          <field-name></field-name>
+          <field-path>
+            <path>some/xpath</path>
+            <weight>1.0</weight>
+          </field-path>
+          <word-lexicons/>
+          <included-elements/>
+          <excluded-elements/>
+          <tokenizer-overrides/>
+          <stemmed-searches>basic</stemmed-searches>
+          <fast-phrase-searches>true</fast-phrase-searches>
+          <fast-case-sensitive-searches>true</fast-case-sensitive-searches>
+          <fast-diacritic-sensitive-searches>true</fast-diacritic-sensitive-searches>
+        </field>
+        <field>
+          <field-name/>
+          <include-root>true</include-root>
+          <fast-case-sensitive-searches>false</fast-case-sensitive-searches>
+          <fast-diacritic-sensitive-searches>false</fast-diacritic-sensitive-searches>
+          <fast-phrase-searches>false</fast-phrase-searches>
+          <one-character-searches>false</one-character-searches>
+          <stemmed-searches>basic</stemmed-searches>
+          <three-character-searches>false</three-character-searches>
+          <three-character-word-positions>false</three-character-word-positions>
+          <trailing-wildcard-searches>false</trailing-wildcard-searches>
+          <trailing-wildcard-word-positions>false</trailing-wildcard-word-positions>
+          <two-character-searches>false</two-character-searches>
+          <value-positions>false</value-positions>
+          <value-searches>false</value-searches>
+          <word-searches>false</word-searches>
+          <word-lexicons/>
+          <included-elements>
+            <included-element>
+              <namespace-uri>http://ns.com</namespace-uri>
+              <localname>blah</localname>
+              <weight>1.0</weight>
+              <attribute-namespace-uri/>
+              <attribute-localname/>
+              <attribute-value/>
+            </included-element>
+          </included-elements>
+          <excluded-elements/>
+        </field>
+      </fields>
+-->
+      <range-element-indexes>
+        <!--
+        Sample for:
+          <name xmlns="http://marklogic.com/ns/sample">bob<name>
+
+        <range-element-index>
+          <scalar-type>string</scalar-type>
+          <namespace-uri>http://marklogic.com/ns/sample</namespace-uri>
+          <localname>name</localname>
+          <collation>http://marklogic.com/collation/codepoint</collation>
+          <range-value-positions>false</range-value-positions>
+        </range-element-index>
+-->
+      </range-element-indexes>
+      <range-element-attribute-indexes>
+<!--
+        Sample for:
+          <person name="bob" xmlns="http://marklogic.com/ns/sample"/>
+
+        <range-element-attribute-index>
+          <scalar-type>string</scalar-type>
+          <parent-namespace-uri>http://marklogic.com/ns/sample</parent-namespace-uri>
+          <parent-localname>person</parent-localname>
+          <namespace-uri/>
+          <localname>name</localname>
+          <collation>http://marklogic.com/collation/codepoint</collation>
+          <range-value-positions>false</range-value-positions>
+        </range-element-attribute-index>
+-->
+      </range-element-attribute-indexes>
+      <range-field-indexes>
+<!--
+        <range-field-index>
+          <scalar-type>date</scalar-type>
+          <field-name>sample</field-name>
+          <collation/>
+          <range-value-positions>false</range-value-positions>
+          <invalid-values>ignore</invalid-values>
+        </range-field-index>
+-->
+      </range-field-indexes>
+
+      <path-namespaces>
+<!--
+        <path-namespace>
+          <prefix>sample</prefix>
+          <namespace-uri>http://marklogic.com/ns/sample</namespace-uri>
+        </path-namespace>
+-->
+      </path-namespaces>
+
+      <range-path-indexes>
+<!--
+        <range-path-index>
+          <scalar-type>string</scalar-type>
+          <collation>http://marklogic.com/collation/codepoint</collation>
+          <path-expression>/sample:root/sample:child</path-expression>
+          <range-value-positions>false</range-value-positions>
+          <invalid-values>reject</invalid-values>
+        </range-path-index>
+-->
+      </range-path-indexes>
+
+      <geospatial-element-indexes>
+<!--
+        <geospatial-element-index>
+          <namespace-uri>http://www.marklogic.com/ns/sample</namespace-uri>
+          <localname>geo-element</localname>
+          <coordinate-system>wgs84</coordinate-system>
+          <point-format>point</point-format>
+          <range-value-positions>false</range-value-positions>
+          <invalid-values>reject</invalid-values>
+        </geospatial-element-index>
+-->
+      </geospatial-element-indexes>
+
+      <geospatial-element-attribute-pair-indexes>
+<!--
+        Sample for:
+          <geo lat="37.237162" lon="-115.8099747" xmlns="http://marklogic.com/ns/sample"/>
+
+        <geospatial-element-attribute-pair-index>
+          <parent-namespace-uri>http://marklogic.com/ns/sample</parent-namespace-uri>
+          <parent-localname>geo</parent-localname>
+          <latitude-namespace-uri/>
+          <latitude-localname>lat</latitude-localname>
+          <longitude-namespace-uri/>
+          <longitude-localname>lon</longitude-localname>
+          <coordinate-system>wgs84</coordinate-system>
+          <range-value-positions>false</range-value-positions>
+        </geospatial-element-attribute-pair-index>
+-->
+      </geospatial-element-attribute-pair-indexes>
+      <geospatial-element-pair-indexes>
+<!--
+        Sample for:
+          <geo xmlns="http://marklogic.com/ns/sample">
+            <lat>37.237162</lat>
+            <lon>-115.8099747</lon>
+          </geo>
+
+        <geospatial-element-pair-index>
+          <parent-namespace-uri>http://marklogic.com/ns/sample</parent-namespace-uri>
+          <parent-localname>geo</parent-localname>
+          <latitude-namespace-uri>http://marklogic.com/ns/sample</latitude-namespace-uri>
+          <latitude-localname>lat</latitude-localname>
+          <longitude-namespace-uri>http://marklogic.com/ns/sample</longitude-namespace-uri>
+          <longitude-localname>lon</longitude-localname>
+          <coordinate-system>wgs84</coordinate-system>
+          <range-value-positions>true</range-value-positions>
+        </geospatial-element-pair-index>
+-->
+      </geospatial-element-pair-indexes>
+      <geospatial-element-child-indexes>
+<!--
+        Sample for:
+          <geo xmlns="http://marklogic.com/ns/sample">
+            <pos>37.237162,-115.8099747</pos>
+          </geo>
+
+        <geospatial-element-child-index>
+          <parent-namespace-uri>http://marklogic.com/ns/sample</parent-namespace-uri>
+          <parent-localname>geo</parent-localname>
+          <namespace-uri>http://marklogic.com/ns/sample</namespace-uri>
+          <localname>pos</localname>
+          <coordinate-system>wgs84</coordinate-system>
+          <point-format>point</point-format>
+          <range-value-positions>false</range-value-positions>
+        </geospatial-element-child-index>
+-->
+      </geospatial-element-child-indexes>
+      <element-word-lexicons>
+<!--
+        <element-word-lexicon>
+          <namespace-uri>http://www.marklogic.com/ns/sample</namespace-uri>
+          <localname>sample-element</localname>
+          <collation>http://marklogic.com/collation/</collation>
+        </element-word-lexicon>
+-->
+      </element-word-lexicons>
+      <element-attribute-word-lexicons>
+<!--
+        <element-attribute-word-lexicon>
+          <parent-namespace-uri>http://www.marklogic.com/ns/sample</parent-namespace-uri>
+          <parent-localname>sample-element</parent-localname>
+          <namespace-uri/>
+          <localname>sample-attribute</localname>
+          <collation>http://marklogic.com/collation/</collation>
+        </element-attribute-word-lexicon>
+-->
+      </element-attribute-word-lexicons>
+    </database>
diff --git a/deploy/sample/ml-config.sample/databases/modules-db.xml b/deploy/sample/ml-config.sample/databases/modules-db.xml
new file mode 100644
index 00000000..0a0e55c7
--- /dev/null
+++ b/deploy/sample/ml-config.sample/databases/modules-db.xml
@@ -0,0 +1,32 @@
+    <!--Create Application Modules Database-->
+    <database xmlns="http://marklogic.com/xdmp/database">
+      <database-name>${modules-db}</database-name>
+      <forests>
+        <forest-id name="${modules-db}"/>
+      </forests>
+      <stemmed-searches>off</stemmed-searches>
+      <word-searches>false</word-searches>
+      <word-positions>false</word-positions>
+      <fast-phrase-searches>false</fast-phrase-searches>
+      <fast-reverse-searches>false</fast-reverse-searches>
+      <fast-case-sensitive-searches>false</fast-case-sensitive-searches>
+      <fast-diacritic-sensitive-searches>false</fast-diacritic-sensitive-searches>
+      <fast-element-word-searches>false</fast-element-word-searches>
+      <element-word-positions>false</element-word-positions>
+      <fast-element-phrase-searches>false</fast-element-phrase-searches>
+      <element-value-positions>false</element-value-positions>
+      <attribute-value-positions>false</attribute-value-positions>
+      <three-character-searches>false</three-character-searches>
+      <three-character-word-positions>false</three-character-word-positions>
+      <fast-element-character-searches>false</fast-element-character-searches>
+      <trailing-wildcard-searches>false</trailing-wildcard-searches>
+      <trailing-wildcard-word-positions>false</trailing-wildcard-word-positions>
+      <fast-element-trailing-wildcard-searches>false</fast-element-trailing-wildcard-searches>
+      <word-lexicons/>
+      <two-character-searches>false</two-character-searches>
+      <one-character-searches>false</one-character-searches>
+      <uri-lexicon>true</uri-lexicon>
+      <collection-lexicon>false</collection-lexicon>
+      <directory-creation>automatic</directory-creation>
+      <maintain-last-modified>false</maintain-last-modified>
+    </database>
diff --git a/deploy/sample/ml-config.sample/databases/rest-modules-db.xml b/deploy/sample/ml-config.sample/databases/rest-modules-db.xml
new file mode 100644
index 00000000..12a0c513
--- /dev/null
+++ b/deploy/sample/ml-config.sample/databases/rest-modules-db.xml
@@ -0,0 +1 @@
+    @ml.rest-modules-db-xml
diff --git a/deploy/sample/ml-config.sample/databases/schemas-db.xml b/deploy/sample/ml-config.sample/databases/schemas-db.xml
new file mode 100644
index 00000000..d7b802ab
--- /dev/null
+++ b/deploy/sample/ml-config.sample/databases/schemas-db.xml
@@ -0,0 +1 @@
+    @ml.schemas-db-xml
diff --git a/deploy/sample/ml-config.sample/databases/test-content-db.xml b/deploy/sample/ml-config.sample/databases/test-content-db.xml
new file mode 100644
index 00000000..383c8688
--- /dev/null
+++ b/deploy/sample/ml-config.sample/databases/test-content-db.xml
@@ -0,0 +1 @@
+    @ml.test-content-db-xml
diff --git a/deploy/sample/ml-config.sample/databases/test-modules-db.xml b/deploy/sample/ml-config.sample/databases/test-modules-db.xml
new file mode 100644
index 00000000..71f032b5
--- /dev/null
+++ b/deploy/sample/ml-config.sample/databases/test-modules-db.xml
@@ -0,0 +1,2 @@
+    <!--Create Test Modules Database-->
+    @ml.test-modules-db-xml
diff --git a/deploy/sample/ml-config.sample/databases/triggers-db.xml b/deploy/sample/ml-config.sample/databases/triggers-db.xml
new file mode 100644
index 00000000..d3d13571
--- /dev/null
+++ b/deploy/sample/ml-config.sample/databases/triggers-db.xml
@@ -0,0 +1,2 @@
+    <!--Create a Triggers Database-->
+    @ml.triggers-db-xml
diff --git a/deploy/sample/ml-config.sample/forests/forests.xml b/deploy/sample/ml-config.sample/forests/forests.xml
new file mode 100644
index 00000000..e5c80d87
--- /dev/null
+++ b/deploy/sample/ml-config.sample/forests/forests.xml
@@ -0,0 +1,17 @@
+<configuration default-group="${group}">
+  <!--Assignments-->
+  <assignments xmlns="http://marklogic.com/xdmp/assignments" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://marklogic.com/xdmp/assignments assignments.xsd">
+    <assignment>
+      <forest-name>${content-db}</forest-name>
+      @ml.forest-data-dir-xml
+    </assignment>
+    @ml.test-content-db-assignment
+    @ml.test-modules-db-assignment
+    @ml.rest-modules-db-assignment
+    <assignment>
+      <forest-name>${modules-db}</forest-name>
+    </assignment>
+    @ml.schemas-assignment
+    @ml.triggers-assignment
+  </assignments>
+</configuration>
diff --git a/deploy/sample/ml-config.sample/groups/default-group.xml b/deploy/sample/ml-config.sample/groups/default-group.xml
new file mode 100644
index 00000000..df2633ec
--- /dev/null
+++ b/deploy/sample/ml-config.sample/groups/default-group.xml
@@ -0,0 +1,13 @@
+<configuration default-group="${group}">
+  <!--
+    default-group applies to databases
+
+    ${group} defaults to "Default", you can override in build.properties or {env}.properties
+    Note: if you change ml.group, make sure to assign hosts to it! See <hosts> below.
+  -->
+  <groups xmlns="http://marklogic.com/xdmp/group">
+    <group>
+      <group-name>${group}</group-name>
+    </group>
+  </groups>
+</configuration>
diff --git a/deploy/sample/ml-config.sample/hosts/bootstrap-host.xml b/deploy/sample/ml-config.sample/hosts/bootstrap-host.xml
new file mode 100644
index 00000000..0af885fd
--- /dev/null
+++ b/deploy/sample/ml-config.sample/hosts/bootstrap-host.xml
@@ -0,0 +1,4 @@
+<host xmlns="http://marklogic.com/xdmp/hosts">
+  <host-name>@ml.server-name</host-name>
+  <group name="${group}"/>
+</host>
diff --git a/deploy/sample/ml-config.sample/security/amps/sample-amp.xml b/deploy/sample/ml-config.sample/security/amps/sample-amp.xml
new file mode 100644
index 00000000..14eb42b5
--- /dev/null
+++ b/deploy/sample/ml-config.sample/security/amps/sample-amp.xml
@@ -0,0 +1,12 @@
+<!--
+  Sample amp. See the Understanding and Using Security Guide section 5.2 for
+  information about amps.
+  http://community.marklogic.com/pubs/5.0/books/security.pdf
+  -->
+<amp xmlns="http://marklogic.com/xdmp/security">
+  <namespace>http://marklogic.com/roxy</namespace>
+  <local-name>sample</local-name>
+  <doc-uri>/app/models/sample.xqy</doc-uri>
+  <db-name>${modules-db}</db-name>
+  <role-name>${app-role}</role-name>
+</amp>
diff --git a/deploy/sample/ml-config.sample/security/certificates/ssl-certificate.xml b/deploy/sample/ml-config.sample/security/certificates/ssl-certificate.xml
new file mode 100644
index 00000000..be6e1a80
--- /dev/null
+++ b/deploy/sample/ml-config.sample/security/certificates/ssl-certificate.xml
@@ -0,0 +1,6 @@
+<!--
+  SSL Certificate, automatically inserted if ssl properties are enabled in build or env properties
+-->
+<certificates xmlns="http://marklogic.com/xdmp/pki">
+  @ml.ssl-certificate-xml
+</certificates>
diff --git a/deploy/sample/ml-config.sample/security/credentials.xml b/deploy/sample/ml-config.sample/security/credentials.xml
new file mode 100644
index 00000000..012637dd
--- /dev/null
+++ b/deploy/sample/ml-config.sample/security/credentials.xml
@@ -0,0 +1,4 @@
+<credentials xmlns="http://marklogic.com/xdmp/security">
+  <aws-access-key>1234abc</aws-access-key>
+  <aws-secret-key>1234abc</aws-secret-key>
+</credentials>
diff --git a/deploy/sample/ml-config.sample/security/external-securities/sample-security.xml b/deploy/sample/ml-config.sample/security/external-securities/sample-security.xml
new file mode 100644
index 00000000..6f500f06
--- /dev/null
+++ b/deploy/sample/ml-config.sample/security/external-securities/sample-security.xml
@@ -0,0 +1,15 @@
+<!--
+  Sample security
+-->
+<external-security xmlns="http://marklogic.com/xdmp/security">
+  <external-security-name>test</external-security-name>
+  <description>a big test</description>
+  <authentication>ldap</authentication>
+  <cache-timeout>300</cache-timeout>
+  <authorization>ldap</authorization>
+  <ldap-server-uri>ldap://dc1.mltest1.local:389</ldap-server-uri>
+  <ldap-base>CN=Users,DC=MLTEST1,DC=LOCAL</ldap-base>
+  <ldap-attribute>sAMAccountName</ldap-attribute>
+  <ldap-default-user/>
+  <ldap-password/>
+</external-security>
diff --git a/deploy/sample/ml-config.sample/security/mimetypes/sample-mimetype.xml b/deploy/sample/ml-config.sample/security/mimetypes/sample-mimetype.xml
new file mode 100644
index 00000000..9a16af51
--- /dev/null
+++ b/deploy/sample/ml-config.sample/security/mimetypes/sample-mimetype.xml
@@ -0,0 +1,8 @@
+<!--
+  Sample mimetype.
+-->
+<mimetype xmlns="http://marklogic.com/xdmp/mimetypes">
+  <name>application/crazy</name>
+  <extension>crazy stuff</extension>
+  <format>text</format>
+</mimetype>
diff --git a/deploy/sample/ml-config.sample/security/privileges/sample-exec-priv.xml b/deploy/sample/ml-config.sample/security/privileges/sample-exec-priv.xml
new file mode 100644
index 00000000..05797c7d
--- /dev/null
+++ b/deploy/sample/ml-config.sample/security/privileges/sample-exec-priv.xml
@@ -0,0 +1,8 @@
+<!--
+  Sample execute privilege.
+-->
+<privilege xmlns="http://marklogic.com/xdmp/security">
+  <privilege-name>my-action</privilege-name>
+  <action>http://marklogic.com/custom/privilege/my-action</action>
+  <kind>execute</kind>
+</privilege>
diff --git a/deploy/sample/ml-config.sample/security/privileges/sample-uri-priv.xml b/deploy/sample/ml-config.sample/security/privileges/sample-uri-priv.xml
new file mode 100644
index 00000000..dbcdc275
--- /dev/null
+++ b/deploy/sample/ml-config.sample/security/privileges/sample-uri-priv.xml
@@ -0,0 +1,8 @@
+<!--
+  Sample URI privilege.
+-->
+<privilege xmlns="http://marklogic.com/xdmp/security">
+  <privilege-name>users-uri</privilege-name>
+  <action>/users/</action>
+  <kind>uri</kind>
+</privilege>
diff --git a/deploy/sample/ml-config.sample/security/roles/app-role.xml b/deploy/sample/ml-config.sample/security/roles/app-role.xml
new file mode 100644
index 00000000..69a277d7
--- /dev/null
+++ b/deploy/sample/ml-config.sample/security/roles/app-role.xml
@@ -0,0 +1,51 @@
+<role xmlns="http://marklogic.com/xdmp/security">
+  <role-name>${app-role}</role-name>
+  <description>A role for users of the ${app-name} application</description>
+  <role-names>
+  </role-names>
+  <permissions>
+    <permission>
+      <capability>execute</capability>
+      <role-name>${app-role}</role-name>
+    </permission>
+    <permission>
+      <capability>update</capability>
+      <role-name>${app-role}</role-name>
+    </permission>
+    <permission>
+      <capability>insert</capability>
+      <role-name>${app-role}</role-name>
+    </permission>
+    <permission>
+      <capability>read</capability>
+      <role-name>${app-role}</role-name>
+    </permission>
+  </permissions>
+  <collections>
+  </collections>
+  <privileges>
+    <privilege>
+      <privilege-name>rest-reader</privilege-name>
+    </privilege>
+    <privilege>
+      <privilege-name>xdmp:value</privilege-name>
+    </privilege>
+    <privilege>
+      <privilege-name>xdmp:add-response-header</privilege-name>
+    </privilege>
+    <privilege>
+      <privilege-name>xdmp:invoke</privilege-name>
+    </privilege>
+    <privilege>
+      <privilege-name>xdmp:with-namespaces</privilege-name>
+    </privilege>
+    <!-- START: required to run Roxy's rewriter-lib -->
+    <privilege>
+      <privilege-name>xdmp:get-server-field</privilege-name>
+    </privilege>
+    <privilege>
+      <privilege-name>xdmp:set-server-field</privilege-name>
+    </privilege>
+    <!-- END: required to run Roxy's rewriter-lib -->
+  </privileges>
+</role>
diff --git a/deploy/sample/ml-config.sample/security/roles/unit-test-role.xml b/deploy/sample/ml-config.sample/security/roles/unit-test-role.xml
new file mode 100644
index 00000000..0b25cd8c
--- /dev/null
+++ b/deploy/sample/ml-config.sample/security/roles/unit-test-role.xml
@@ -0,0 +1,44 @@
+<role xmlns="http://marklogic.com/xdmp/security">
+  <role-name>${app-role}-unit-test</role-name>
+  <description>A role for unit testing the ${app-name} application</description>
+  <role-names>
+    <role-name>${app-role}</role-name>
+  </role-names>
+  <privileges>
+    <!-- START: privileges needed for unit testing while running on filesystem -->
+    <privilege>
+      <privilege-name>xdmp:document-get</privilege-name>
+    </privilege>
+    <privilege>
+      <privilege-name>xdmp:filesystem-directory</privilege-name>
+    </privilege>
+    <privilege>
+      <privilege-name>xdmp:save</privilege-name>
+    </privilege>
+    <!-- END: privileges needed for unit testing while running on filesystem -->
+    <privilege>
+      <privilege-name>any-uri</privilege-name>
+    </privilege>
+    <privilege>
+      <privilege-name>xdmp:eval</privilege-name>
+    </privilege>
+    <privilege>
+      <privilege-name>xdmp:eval-in</privilege-name>
+    </privilege>
+    <privilege>
+      <privilege-name>xdmp:http-delete</privilege-name>
+    </privilege>
+    <privilege>
+      <privilege-name>xdmp:http-get</privilege-name>
+    </privilege>
+    <privilege>
+      <privilege-name>xdmp:http-head</privilege-name>
+    </privilege>
+    <privilege>
+      <privilege-name>xdmp:http-post</privilege-name>
+    </privilege>
+    <privilege>
+      <privilege-name>xdmp:http-put</privilege-name>
+    </privilege>
+  </privileges>
+</role>
diff --git a/deploy/sample/ml-config.sample/security/users/default-user.xml b/deploy/sample/ml-config.sample/security/users/default-user.xml
new file mode 100644
index 00000000..187a1038
--- /dev/null
+++ b/deploy/sample/ml-config.sample/security/users/default-user.xml
@@ -0,0 +1,10 @@
+<user xmlns="http://marklogic.com/xdmp/security">
+  <user-name>${default-user}</user-name>
+  <description>A user for the ${app-name} application</description>
+  <password>${appuser-password}</password>
+  <role-names>
+    <role-name>${app-role}</role-name>
+  </role-names>
+  <permissions/>
+  <collections/>
+</user>
diff --git a/deploy/sample/ml-config.sample/security/users/test-user.xml b/deploy/sample/ml-config.sample/security/users/test-user.xml
new file mode 100644
index 00000000..5122d34a
--- /dev/null
+++ b/deploy/sample/ml-config.sample/security/users/test-user.xml
@@ -0,0 +1 @@
+@ml.test-user-xml
diff --git a/deploy/sample/ml-config.sample/servers/app-name-odbc.xml b/deploy/sample/ml-config.sample/servers/app-name-odbc.xml
new file mode 100644
index 00000000..2219255a
--- /dev/null
+++ b/deploy/sample/ml-config.sample/servers/app-name-odbc.xml
@@ -0,0 +1 @@
+@ml.odbc-server
diff --git a/deploy/sample/ml-config.sample/servers/app-name-rest.xml b/deploy/sample/ml-config.sample/servers/app-name-rest.xml
new file mode 100644
index 00000000..5ef1f153
--- /dev/null
+++ b/deploy/sample/ml-config.sample/servers/app-name-rest.xml
@@ -0,0 +1 @@
+@ml.rest-appserver
diff --git a/deploy/sample/ml-config.sample/servers/app-name-xcc.xml b/deploy/sample/ml-config.sample/servers/app-name-xcc.xml
new file mode 100644
index 00000000..e97f0f1d
--- /dev/null
+++ b/deploy/sample/ml-config.sample/servers/app-name-xcc.xml
@@ -0,0 +1 @@
+@ml.xdbc-server
diff --git a/deploy/sample/ml-config.sample/servers/app-name.xml b/deploy/sample/ml-config.sample/servers/app-name.xml
new file mode 100644
index 00000000..c821a582
--- /dev/null
+++ b/deploy/sample/ml-config.sample/servers/app-name.xml
@@ -0,0 +1,21 @@
+<!--Default Application Server-->
+<http-server xmlns="http://marklogic.com/xdmp/group">
+  <http-server-name>${app-name}</http-server-name>
+  <port>${app-port}</port>
+  <database name="${content-db}"/>
+  <modules name="${modules-db}"/>
+  <root>${modules-root}</root>
+  <authentication>${authentication-method}</authentication>
+  <default-user name="${default-user}"/>
+  <url-rewriter>${url-rewriter}</url-rewriter>
+  <error-handler>${error-handler}</error-handler>
+  @ml.rewrite-resolves-globally
+  <!-- for external security use:
+
+  <internal-security>false</internal-security>
+  <external-security name="name-of-your-external-security-config"/>
+
+  -->
+
+  <!-- <ssl-certificate-template>@ml.ssl-certificate-template</ssl-certificate-template> -->
+</http-server>
diff --git a/deploy/sample/ml-config.sample/servers/test-server.xml b/deploy/sample/ml-config.sample/servers/test-server.xml
new file mode 100644
index 00000000..a85bf2f9
--- /dev/null
+++ b/deploy/sample/ml-config.sample/servers/test-server.xml
@@ -0,0 +1 @@
+@ml.test-appserver
diff --git a/deploy/sample/ml-config.sample/tasks/tasks.xml b/deploy/sample/ml-config.sample/tasks/tasks.xml
new file mode 100644
index 00000000..a561bdc3
--- /dev/null
+++ b/deploy/sample/ml-config.sample/tasks/tasks.xml
@@ -0,0 +1,91 @@
+<configuration default-group="${group}">
+  <groups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://marklogic.com/xdmp/group" xsi:schemaLocation="http://marklogic.com/xdmp/group group.xsd">
+    <group>
+      <group-name>${group}</group-name>
+      <!--
+        Only enable the task server section if you need to.
+      -->
+      <task-server>
+        <!--
+        <threads>16</threads>
+        <debug-threads>16</debug-threads>
+        <max-time-limit>3600</max-time-limit>
+        <default-time-limit>600</default-time-limit>
+        <queue-size>100000</queue-size>
+        <pre-commit-trigger-depth>1000</pre-commit-trigger-depth>
+        <post-commit-trigger-depth>1000</post-commit-trigger-depth>
+        <pre-commit-trigger-limit>10000</pre-commit-trigger-limit>
+        <log-errors>true</log-errors>
+        <debug-allow>true</debug-allow>
+        <profile-allow>true</profile-allow>
+        -->
+        <scheduled-tasks>
+          <scheduled-task>
+            <task-path>/some/daily-task.xqy</task-path>
+            <task-root>/</task-root>
+            <task-type>daily</task-type>
+            <task-period>2</task-period>
+            <task-start-time>13:00:00-05:00</task-start-time>
+            <task-database name="${content-db}"/>
+            <task-modules name="${modules-db}"/>
+            <task-user name="${default-user}"/>
+          </scheduled-task>
+          <scheduled-task>
+            <task-path>/some/hourly-task.xqy</task-path>
+            <task-root>/</task-root>
+            <task-type>hourly</task-type>
+            <task-period>2</task-period>
+            <task-minute>15</task-minute>
+            <task-database name="${content-db}"/>
+            <task-modules name="${modules-db}"/>
+            <task-user name="${default-user}"/>
+          </scheduled-task>
+          <scheduled-task>
+            <task-path>/some/minutely-task.xqy</task-path>
+            <task-root>/</task-root>
+            <task-type>minutely</task-type>
+            <task-period>3</task-period>
+            <task-database name="${content-db}"/>
+            <task-modules name="${modules-db}"/>
+            <task-user name="${default-user}"/>
+          </scheduled-task>
+          <scheduled-task>
+            <task-path>/some/monthly-task.xqy</task-path>
+            <task-root>/</task-root>
+            <task-type>monthly</task-type>
+            <task-period>1</task-period>
+            <task-month-day>15</task-month-day>
+            <task-start-time>13:00:00-05:00</task-start-time>
+            <task-database name="${content-db}"/>
+            <task-modules name="${modules-db}"/>
+            <task-user name="${default-user}"/>
+          </scheduled-task>
+          <scheduled-task>
+            <task-path>/some/once-task.xqy</task-path>
+            <task-root>/</task-root>
+            <task-type>once</task-type>
+            <task-start>2019-01-01T13:00:00-05:00</task-start>
+            <task-database name="${content-db}"/>
+            <task-modules name="${modules-db}"/>
+            <task-user name="${default-user}"/>
+          </scheduled-task>
+          <scheduled-task>
+            <task-path>/some/weekly-task.xqy</task-path>
+            <task-root>/</task-root>
+            <task-type>weekly</task-type>
+            <task-period>1</task-period>
+            <task-days>
+              <task-day>monday</task-day>
+              <task-day>wednesday</task-day>
+              <task-day>friday</task-day>
+            </task-days>
+            <task-start-time>13:00:00-05:00</task-start-time>
+            <task-database name="${content-db}"/>
+            <task-modules name="${modules-db}"/>
+            <task-user name="${default-user}"/>
+          </scheduled-task>
+        </scheduled-tasks>
+      </task-server>
+    </group>
+  </groups>
+</configuration>