diff --git a/jetty-deploy/src/main/config/etc/jetty-decorate.xml b/jetty-deploy/src/main/config/etc/jetty-decorate.xml
index 9bbeba9f394..330ea79ae68 100644
--- a/jetty-deploy/src/main/config/etc/jetty-decorate.xml
+++ b/jetty-deploy/src/main/config/etc/jetty-decorate.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
 
-<!-- =============================================================== --><!-- Mixin the Weld / CDI classes to the class loader                --><!-- =============================================================== -->
+<!-- =============================================================== -->
+<!-- Mixin the Weld / CDI classes to the class loader                -->
+<!-- =============================================================== -->
 
 <Configure id="Server" class="org.eclipse.jetty.server.Server">
   <!-- Bind the jetty-web-decorate.xml to every deployed webapp -->
diff --git a/jetty-deploy/src/main/config/etc/jetty-deploy.xml b/jetty-deploy/src/main/config/etc/jetty-deploy.xml
index a5c38d33d03..02fa9ae4de4 100644
--- a/jetty-deploy/src/main/config/etc/jetty-deploy.xml
+++ b/jetty-deploy/src/main/config/etc/jetty-deploy.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
 
-<!-- =============================================================== --><!-- Create the deployment manager                                   --><!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --><!-- The deplyment manager handles the lifecycle of deploying web    --><!-- applications. Apps are provided by instances of the             --><!-- AppProvider interface.                                          --><!-- =============================================================== -->
+<!-- =============================================================== -->
+<!-- Create the deployment manager                                   -->
+<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+<!-- The deplyment manager handles the lifecycle of deploying web    -->
+<!-- applications. Apps are provided by instances of the             -->
+<!-- AppProvider interface.                                          -->
+<!-- =============================================================== -->
 <Configure id="Server" class="org.eclipse.jetty.server.Server">
 
   <Call name="addBean">
diff --git a/jetty-deploy/src/test/resources/jetty-http.xml b/jetty-deploy/src/test/resources/jetty-http.xml
index 43ed57d5425..505d92a3abd 100644
--- a/jetty-deploy/src/test/resources/jetty-http.xml
+++ b/jetty-deploy/src/test/resources/jetty-http.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
 
-<!-- ============================================================= --><!-- Configure the Jetty Server instance with an ID "Server"       --><!-- by adding an HTTP connector.                                   --><!-- This configuration must be used in conjunction with jetty.xml --><!-- ============================================================= -->
+<!-- ============================================================= -->
+<!-- Configure the Jetty Server instance with an ID "Server"       -->
+<!-- by adding an HTTP connector.                                   -->
+<!-- This configuration must be used in conjunction with jetty.xml -->
+<!-- ============================================================= -->
 <Configure id="Server" class="org.eclipse.jetty.server.Server">
 
   <!-- =========================================================== -->
diff --git a/jetty-deploy/src/test/resources/jetty.xml b/jetty-deploy/src/test/resources/jetty.xml
index 576d20a7d2f..5178d3aa2bb 100644
--- a/jetty-deploy/src/test/resources/jetty.xml
+++ b/jetty-deploy/src/test/resources/jetty.xml
@@ -1,8 +1,27 @@
 <?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
 
-<!-- =============================================================== --><!-- Documentation of this file format can be found at:              --><!-- https://www.eclipse.org/jetty/documentation/current/        --><!--                                                                 --><!-- Additional configuration files are available in $JETTY_HOME/etc --><!-- and can be mixed in. See start.ini file for the default         --><!-- configuration files.                                            --><!--                                                                 --><!-- For a description of the configuration mechanism, see the       --><!-- output of:                                                      --><!--   java -jar start.jar -?                                        --><!-- =============================================================== -->
+<!-- =============================================================== -->
+<!-- Documentation of this file format can be found at:              -->
+<!-- https://www.eclipse.org/jetty/documentation/current/        -->
+<!--                                                                 -->
+<!-- Additional configuration files are available in $JETTY_HOME/etc -->
+<!-- and can be mixed in. See start.ini file for the default         -->
+<!-- configuration files.                                            -->
+<!--                                                                 -->
+<!-- For a description of the configuration mechanism, see the       -->
+<!-- output of:                                                      -->
+<!--   java -jar start.jar -?                                        -->
+<!-- =============================================================== -->
 
-<!-- =============================================================== --><!-- Configure a Jetty Server instance with an ID "Server"           --><!-- Other configuration files may also configure the "Server"       --><!-- ID, in which case they are adding configuration to the same     --><!-- instance.  If other configuration have a different ID, they     --><!-- will create and configure another instance of Jetty.            --><!-- Consult the javadoc of o.e.j.server.Server for all              --><!-- configuration that may be set here.                             --><!-- =============================================================== -->
+<!-- =============================================================== -->
+<!-- Configure a Jetty Server instance with an ID "Server"           -->
+<!-- Other configuration files may also configure the "Server"       -->
+<!-- ID, in which case they are adding configuration to the same     -->
+<!-- instance.  If other configuration have a different ID, they     -->
+<!-- will create and configure another instance of Jetty.            -->
+<!-- Consult the javadoc of o.e.j.server.Server for all              -->
+<!-- configuration that may be set here.                             -->
+<!-- =============================================================== -->
 <Configure id="Server" class="org.eclipse.jetty.server.Server">
 
     <!-- =========================================================== -->
diff --git a/jetty-home/src/main/resources/etc/jetty-setuid.xml b/jetty-home/src/main/resources/etc/jetty-setuid.xml
index 11550a4d455..891f1c02244 100644
--- a/jetty-home/src/main/resources/etc/jetty-setuid.xml
+++ b/jetty-home/src/main/resources/etc/jetty-setuid.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
 
-<!-- ================================================================ --><!-- Configure the Jetty SetUIDListener                                --><!-- ================================================================ -->
+<!-- ================================================================ -->
+<!-- Configure the Jetty SetUIDListener                                -->
+<!-- ================================================================ -->
 <Configure id="Server" class="org.eclipse.jetty.server.Server">
 
   <Call name="addLifeCycleListener">
diff --git a/jetty-home/src/main/resources/etc/jetty-started.xml b/jetty-home/src/main/resources/etc/jetty-started.xml
index 64af23e15aa..467cdb6c3fa 100644
--- a/jetty-home/src/main/resources/etc/jetty-started.xml
+++ b/jetty-home/src/main/resources/etc/jetty-started.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
 
-<!-- =============================================================== --><!-- Mixin the Start FileNoticeLifeCycleListener                     --><!-- =============================================================== -->
+<!-- =============================================================== -->
+<!-- Mixin the Start FileNoticeLifeCycleListener                     -->
+<!-- =============================================================== -->
 <Configure id="Server" class="org.eclipse.jetty.server.Server">
   <Call name="addLifeCycleListener">
     <Arg>
diff --git a/jetty-home/src/main/resources/modules/jamon/jamon.xml b/jetty-home/src/main/resources/modules/jamon/jamon.xml
index f9447f41d09..7e3e49b9546 100644
--- a/jetty-home/src/main/resources/modules/jamon/jamon.xml
+++ b/jetty-home/src/main/resources/modules/jamon/jamon.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
 
-<!-- =============================================================== --><!-- Mixin the Jamon Handler                                         --><!-- =============================================================== -->
+<!-- =============================================================== -->
+<!-- Mixin the Jamon Handler                                         -->
+<!-- =============================================================== -->
 
 <Configure id="Server" class="org.eclipse.jetty.server.Server">
 
diff --git a/jetty-maven-plugin/src/it/jetty-run-distro-mojo-it/jetty-simple-webapp/src/base/etc/test-jetty.xml b/jetty-maven-plugin/src/it/jetty-run-distro-mojo-it/jetty-simple-webapp/src/base/etc/test-jetty.xml
index 52e0cc6be76..8c1d9dbef70 100644
--- a/jetty-maven-plugin/src/it/jetty-run-distro-mojo-it/jetty-simple-webapp/src/base/etc/test-jetty.xml
+++ b/jetty-maven-plugin/src/it/jetty-run-distro-mojo-it/jetty-simple-webapp/src/base/etc/test-jetty.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
 
 <Configure id="Server" class="org.eclipse.jetty.server.Server">
-  <Ref id="httpConnector">
+  <Ref refid="httpConnector">
         <Call name="addLifeCycleListener">
           <Arg>
             <New class="org.eclipse.jetty.maven.plugin.ServerConnectorListener">
diff --git a/jetty-maven-plugin/src/main/resources/maven.xml b/jetty-maven-plugin/src/main/resources/maven.xml
index 8a454960d9d..7265993aed0 100644
--- a/jetty-maven-plugin/src/main/resources/maven.xml
+++ b/jetty-maven-plugin/src/main/resources/maven.xml
@@ -3,7 +3,7 @@
 <Configure id="wac" class="org.eclipse.jetty.maven.plugin.JettyWebAppContext">
 
   <Call class="org.eclipse.jetty.webapp.Configuration$ClassList" name="setServerDefault">
-    <Arg><Ref id="Server" /></Arg>
+    <Arg><Ref refid="Server" /></Arg>
     <Call name="replace">
       <Arg>org.eclipse.jetty.webapp.WebInfConfiguration</Arg>
       <Arg>org.eclipse.jetty.maven.plugin.MavenWebInfConfiguration</Arg>
@@ -11,9 +11,9 @@
   </Call>
 
   <Call class="org.eclipse.jetty.maven.plugin.WebAppPropertyConverter" name="fromProperties">
-    <Arg><Ref id="wac"/></Arg>
+    <Arg><Ref refid="wac"/></Arg>
     <Arg><Property name="jetty.base" default="."/>/etc/maven.props</Arg>
-    <Arg><Ref id="Server"/></Arg>
+    <Arg><Ref refid="Server"/></Arg>
     <Arg></Arg>
   </Call>
 
diff --git a/jetty-osgi/jetty-osgi-boot/jettyhome/etc/jetty-http.xml b/jetty-osgi/jetty-osgi-boot/jettyhome/etc/jetty-http.xml
index 412e644a2e2..26b9ce2fd15 100644
--- a/jetty-osgi/jetty-osgi-boot/jettyhome/etc/jetty-http.xml
+++ b/jetty-osgi/jetty-osgi-boot/jettyhome/etc/jetty-http.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
 
-<!-- ============================================================= --><!-- Configure the Jetty Server instance with an ID "Server"       --><!-- by adding an HTTP connector.                                   --><!-- This configuration must be used in conjunction with jetty.xml --><!-- ============================================================= -->
+<!-- ============================================================= -->
+<!-- Configure the Jetty Server instance with an ID "Server"       -->
+<!-- by adding an HTTP connector.                                   -->
+<!-- This configuration must be used in conjunction with jetty.xml -->
+<!-- ============================================================= -->
 <Configure id="Server" class="org.eclipse.jetty.server.Server">
 
   <!-- =========================================================== -->
diff --git a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http-boot-context-as-service.xml b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http-boot-context-as-service.xml
index 8e2360b85ca..3bc26b74050 100644
--- a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http-boot-context-as-service.xml
+++ b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http-boot-context-as-service.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
 
-<!-- ============================================================= --><!-- Configure the Jetty Server instance with an ID "Server"       --><!-- by adding an HTTP connector.                                   --><!-- This configuration must be used in conjunction with jetty.xml --><!-- ============================================================= -->
+<!-- ============================================================= -->
+<!-- Configure the Jetty Server instance with an ID "Server"       -->
+<!-- by adding an HTTP connector.                                   -->
+<!-- This configuration must be used in conjunction with jetty.xml -->
+<!-- ============================================================= -->
 <Configure id="Server" class="org.eclipse.jetty.server.Server">
 
   <!-- =========================================================== -->
diff --git a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http-boot-webapp-as-service.xml b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http-boot-webapp-as-service.xml
index bccf90e1204..7796b48efe0 100644
--- a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http-boot-webapp-as-service.xml
+++ b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http-boot-webapp-as-service.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
 
-<!-- ============================================================= --><!-- Configure the Jetty Server instance with an ID "Server"       --><!-- by adding an HTTP connector.                                   --><!-- This configuration must be used in conjunction with jetty.xml --><!-- ============================================================= -->
+<!-- ============================================================= -->
+<!-- Configure the Jetty Server instance with an ID "Server"       -->
+<!-- by adding an HTTP connector.                                   -->
+<!-- This configuration must be used in conjunction with jetty.xml -->
+<!-- ============================================================= -->
 <Configure id="Server" class="org.eclipse.jetty.server.Server">
 
   <!-- =========================================================== -->
diff --git a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http-boot-with-annotations.xml b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http-boot-with-annotations.xml
index eab6f8936c8..28d3d6b5933 100644
--- a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http-boot-with-annotations.xml
+++ b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http-boot-with-annotations.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
 
-<!-- ============================================================= --><!-- Configure the Jetty Server instance with an ID "Server"       --><!-- by adding an HTTP connector.                                   --><!-- This configuration must be used in conjunction with jetty.xml --><!-- ============================================================= -->
+<!-- ============================================================= -->
+<!-- Configure the Jetty Server instance with an ID "Server"       -->
+<!-- by adding an HTTP connector.                                   -->
+<!-- This configuration must be used in conjunction with jetty.xml -->
+<!-- ============================================================= -->
 <Configure id="Server" class="org.eclipse.jetty.server.Server">
 
   <!-- =========================================================== -->
diff --git a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http-boot-with-javax-websocket.xml b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http-boot-with-javax-websocket.xml
index dca7d650b74..fd7b71533a5 100644
--- a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http-boot-with-javax-websocket.xml
+++ b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http-boot-with-javax-websocket.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
 
-<!-- ============================================================= --><!-- Configure the Jetty Server instance with an ID "Server"       --><!-- by adding an HTTP connector.                                   --><!-- This configuration must be used in conjunction with jetty.xml --><!-- ============================================================= -->
+<!-- ============================================================= -->
+<!-- Configure the Jetty Server instance with an ID "Server"       -->
+<!-- by adding an HTTP connector.                                   -->
+<!-- This configuration must be used in conjunction with jetty.xml -->
+<!-- ============================================================= -->
 <Configure id="Server" class="org.eclipse.jetty.server.Server">
 
   <!-- =========================================================== -->
diff --git a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http-boot-with-jsp.xml b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http-boot-with-jsp.xml
index 38b5a790496..c2a2040fe59 100644
--- a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http-boot-with-jsp.xml
+++ b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http-boot-with-jsp.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
 
-<!-- ============================================================= --><!-- Configure the Jetty Server instance with an ID "Server"       --><!-- by adding an HTTP connector.                                   --><!-- This configuration must be used in conjunction with jetty.xml --><!-- ============================================================= -->
+<!-- ============================================================= -->
+<!-- Configure the Jetty Server instance with an ID "Server"       -->
+<!-- by adding an HTTP connector.                                   -->
+<!-- This configuration must be used in conjunction with jetty.xml -->
+<!-- ============================================================= -->
 <Configure id="Server" class="org.eclipse.jetty.server.Server">
 
   <!-- =========================================================== -->
diff --git a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http-boot-with-resources.xml b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http-boot-with-resources.xml
index 0ef75aa957b..f5530acdc29 100644
--- a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http-boot-with-resources.xml
+++ b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http-boot-with-resources.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
 
-<!-- ============================================================= --><!-- Configure the Jetty Server instance with an ID "Server"       --><!-- by adding an HTTP connector.                                   --><!-- This configuration must be used in conjunction with jetty.xml --><!-- ============================================================= -->
+<!-- ============================================================= -->
+<!-- Configure the Jetty Server instance with an ID "Server"       -->
+<!-- by adding an HTTP connector.                                   -->
+<!-- This configuration must be used in conjunction with jetty.xml -->
+<!-- ============================================================= -->
 <Configure id="Server" class="org.eclipse.jetty.server.Server">
 
   <!-- =========================================================== -->
diff --git a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http-boot-with-websocket.xml b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http-boot-with-websocket.xml
index e6857ba7b89..665e5b40b7c 100644
--- a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http-boot-with-websocket.xml
+++ b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http-boot-with-websocket.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
 
-<!-- ============================================================= --><!-- Configure the Jetty Server instance with an ID "Server"       --><!-- by adding an HTTP connector.                                   --><!-- This configuration must be used in conjunction with jetty.xml --><!-- ============================================================= -->
+<!-- ============================================================= -->
+<!-- Configure the Jetty Server instance with an ID "Server"       -->
+<!-- by adding an HTTP connector.                                   -->
+<!-- This configuration must be used in conjunction with jetty.xml -->
+<!-- ============================================================= -->
 <Configure id="Server" class="org.eclipse.jetty.server.Server">
 
   <!-- =========================================================== -->
diff --git a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http.xml b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http.xml
index 11c1650548d..369d18540cb 100644
--- a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http.xml
+++ b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
 
-<!-- ============================================================= --><!-- Configure the Jetty Server instance with an ID "Server"       --><!-- by adding an HTTP connector.                                   --><!-- This configuration must be used in conjunction with jetty.xml --><!-- ============================================================= -->
+<!-- ============================================================= -->
+<!-- Configure the Jetty Server instance with an ID "Server"       -->
+<!-- by adding an HTTP connector.                                   -->
+<!-- This configuration must be used in conjunction with jetty.xml -->
+<!-- ============================================================= -->
 <Configure id="Server" class="org.eclipse.jetty.server.Server">
 
   <!-- =========================================================== -->
diff --git a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http2-jdk9.xml b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http2-jdk9.xml
index 56777719fdf..84b0306abb2 100644
--- a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http2-jdk9.xml
+++ b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http2-jdk9.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
 
-<!-- ============================================================= --><!-- Configure an HTTP2 on the ssl connector.                       --><!-- ============================================================= -->
+<!-- ============================================================= -->
+<!-- Configure an HTTP2 on the ssl connector.                       -->
+<!-- ============================================================= -->
 <Configure id="sslConnector" class="org.eclipse.jetty.server.ServerConnector">
   <Call name="addConnectionFactory">
     <Arg>
diff --git a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http2.xml b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http2.xml
index 5e85f018046..7b2af9508e6 100644
--- a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http2.xml
+++ b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http2.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
 
-<!-- ============================================================= --><!-- Configure an HTTP2 on the ssl connector.                       --><!-- ============================================================= -->
+<!-- ============================================================= -->
+<!-- Configure an HTTP2 on the ssl connector.                       -->
+<!-- ============================================================= -->
 <Configure id="sslConnector" class="org.eclipse.jetty.server.ServerConnector">
   <Call name="addConnectionFactory">
     <Arg>
diff --git a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-https.xml b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-https.xml
index 30199cb8677..7abbc4551ec 100644
--- a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-https.xml
+++ b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-https.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
 
-<!-- ============================================================= --><!-- Configure an HTTPS connector.                                  --><!-- This configuration must be used in conjunction with jetty.xml --><!-- and jetty-ssl.xml.                                            --><!-- ============================================================= -->
+<!-- ============================================================= -->
+<!-- Configure an HTTPS connector.                                  -->
+<!-- This configuration must be used in conjunction with jetty.xml -->
+<!-- and jetty-ssl.xml.                                            -->
+<!-- ============================================================= -->
 <Configure id="sslConnector" class="org.eclipse.jetty.server.ServerConnector">
 
   <Call name="addIfAbsentConnectionFactory">
diff --git a/jetty-plus/src/main/plus-config/etc/jetty-plus.xml b/jetty-plus/src/main/plus-config/etc/jetty-plus.xml
index f96b7552f4e..fd6e8b3e933 100644
--- a/jetty-plus/src/main/plus-config/etc/jetty-plus.xml
+++ b/jetty-plus/src/main/plus-config/etc/jetty-plus.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
 
-<!-- =============================================================== --><!-- Configure extended support for webapps                          --><!-- =============================================================== -->
+<!-- =============================================================== -->
+<!-- Configure extended support for webapps                          -->
+<!-- =============================================================== -->
 <Configure id="Server" class="org.eclipse.jetty.server.Server">
 
   <!-- =========================================================== -->
diff --git a/jetty-rewrite/src/test/resources/org.mortbay.jetty.rewrite.handler/jetty-rewrite.xml b/jetty-rewrite/src/test/resources/org.mortbay.jetty.rewrite.handler/jetty-rewrite.xml
index fa6bc790c4f..bb0d641375d 100644
--- a/jetty-rewrite/src/test/resources/org.mortbay.jetty.rewrite.handler/jetty-rewrite.xml
+++ b/jetty-rewrite/src/test/resources/org.mortbay.jetty.rewrite.handler/jetty-rewrite.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
 
-<!-- =============================================================== --><!-- Configure the Jetty Server                                      --><!--                                                                 --><!-- Documentation of this file format can be found at:              --><!-- http://docs.codehaus.org/display/JETTY/jetty.xml                --><!--                                                                 --><!-- =============================================================== -->
+<!-- =============================================================== -->
+<!-- Configure the Jetty Server                                      -->
+<!--                                                                 -->
+<!-- Documentation of this file format can be found at:              -->
+<!-- http://docs.codehaus.org/display/JETTY/jetty.xml                -->
+<!--                                                                 -->
+<!-- =============================================================== -->
 
 
 <Configure id="Server" class="org.eclipse.jetty.server.Server">
diff --git a/jetty-server/src/main/config/etc/home-base-warning.xml b/jetty-server/src/main/config/etc/home-base-warning.xml
index 826eab99022..64a02e928be 100644
--- a/jetty-server/src/main/config/etc/home-base-warning.xml
+++ b/jetty-server/src/main/config/etc/home-base-warning.xml
@@ -1,4 +1,6 @@
 <?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
 
-<!-- ============================================================= --><!-- Display a Warning Message if {jetty.home} == {jetty.base}     --><!-- ============================================================= -->
-<Configure id="homeBaseWarning" class="org.eclipse.jetty.server.HomeBaseWarning"></Configure>
+<!-- ============================================================= -->
+<!-- Display a Warning Message if {jetty.home} == {jetty.base}     -->
+<!-- ============================================================= -->
+<Configure id="homeBaseWarning" class="org.eclipse.jetty.server.HomeBaseWarning" />
diff --git a/jetty-server/src/main/config/etc/jetty-customrequestlog.xml b/jetty-server/src/main/config/etc/jetty-customrequestlog.xml
index 4337978d144..a01217d126b 100644
--- a/jetty-server/src/main/config/etc/jetty-customrequestlog.xml
+++ b/jetty-server/src/main/config/etc/jetty-customrequestlog.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
 
-<!-- =============================================================== --><!-- Configure the Jetty Request Log                                 --><!-- =============================================================== -->
+<!-- =============================================================== -->
+<!-- Configure the Jetty Request Log                                 -->
+<!-- =============================================================== -->
 <Configure id="Server" class="org.eclipse.jetty.server.Server">
 
   <!-- =========================================================== -->
diff --git a/jetty-server/src/main/config/etc/jetty-debug.xml b/jetty-server/src/main/config/etc/jetty-debug.xml
index f362c234ac2..aba97811693 100644
--- a/jetty-server/src/main/config/etc/jetty-debug.xml
+++ b/jetty-server/src/main/config/etc/jetty-debug.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
 
-<!-- =============================================================== --><!-- The DebugListener                                               --><!-- =============================================================== -->
+<!-- =============================================================== -->
+<!-- The DebugListener                                               -->
+<!-- =============================================================== -->
 
 <Configure id="Server" class="org.eclipse.jetty.server.Server">
   <New id="DebugListener" class="org.eclipse.jetty.server.DebugListener">
diff --git a/jetty-server/src/main/config/etc/jetty-debuglog.xml b/jetty-server/src/main/config/etc/jetty-debuglog.xml
index 283203c5e4a..646d544e6dc 100644
--- a/jetty-server/src/main/config/etc/jetty-debuglog.xml
+++ b/jetty-server/src/main/config/etc/jetty-debuglog.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
 
-<!-- =============================================================== --><!-- The DebugHandler                                                --><!-- =============================================================== -->
+<!-- =============================================================== -->
+<!-- The DebugHandler                                                -->
+<!-- =============================================================== -->
 
 <Configure id="Server" class="org.eclipse.jetty.server.Server">
   <Call name="insertHandler">
diff --git a/jetty-server/src/main/config/etc/jetty-gzip.xml b/jetty-server/src/main/config/etc/jetty-gzip.xml
index e9b7db85e94..c7efdacd7d4 100644
--- a/jetty-server/src/main/config/etc/jetty-gzip.xml
+++ b/jetty-server/src/main/config/etc/jetty-gzip.xml
@@ -1,6 +1,11 @@
 <?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
 
-<!-- =============================================================== --><!-- Mixin the GZIP Handler                                          --><!-- This applies the GZIP Handler to the entire server              --><!-- If a GZIP handler is required for an individual context, then   --><!-- use a context XML (see test.xml example in distribution)        --><!-- =============================================================== -->
+<!-- =============================================================== -->
+<!-- Mixin the GZIP Handler                                          -->
+<!-- This applies the GZIP Handler to the entire server              -->
+<!-- If a GZIP handler is required for an individual context, then   -->
+<!-- use a context XML (see test.xml example in distribution)        -->
+<!-- =============================================================== -->
 
 <Configure id="Server" class="org.eclipse.jetty.server.Server">
   <Call name="insertHandler">
diff --git a/jetty-server/src/main/config/etc/jetty-http.xml b/jetty-server/src/main/config/etc/jetty-http.xml
index ba8a605febb..2dd3fd48fdb 100644
--- a/jetty-server/src/main/config/etc/jetty-http.xml
+++ b/jetty-server/src/main/config/etc/jetty-http.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
 
-<!-- ============================================================= --><!-- Configure the Jetty Server instance with an ID "Server"       --><!-- by adding an HTTP connector.                                   --><!-- This configuration must be used in conjunction with jetty.xml --><!-- ============================================================= -->
+<!-- ============================================================= -->
+<!-- Configure the Jetty Server instance with an ID "Server"       -->
+<!-- by adding an HTTP connector.                                   -->
+<!-- This configuration must be used in conjunction with jetty.xml -->
+<!-- ============================================================= -->
 <Configure id="Server" class="org.eclipse.jetty.server.Server">
 
   <!-- =========================================================== -->
diff --git a/jetty-server/src/main/config/etc/jetty-https.xml b/jetty-server/src/main/config/etc/jetty-https.xml
index 99abd18df59..529b6d0ca89 100644
--- a/jetty-server/src/main/config/etc/jetty-https.xml
+++ b/jetty-server/src/main/config/etc/jetty-https.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
 
-<!-- ============================================================= --><!-- Configure an HTTPS connector.                                  --><!-- This configuration must be used in conjunction with jetty.xml --><!-- and jetty-ssl.xml.                                            --><!-- ============================================================= -->
+<!-- ============================================================= -->
+<!-- Configure an HTTPS connector.                                  -->
+<!-- This configuration must be used in conjunction with jetty.xml -->
+<!-- and jetty-ssl.xml.                                            -->
+<!-- ============================================================= -->
 <Configure id="sslConnector" class="org.eclipse.jetty.server.ServerConnector">
 
   <Call name="addIfAbsentConnectionFactory">
diff --git a/jetty-server/src/main/config/etc/jetty-ipaccess.xml b/jetty-server/src/main/config/etc/jetty-ipaccess.xml
index abe9d0eb16f..e9607a91abf 100644
--- a/jetty-server/src/main/config/etc/jetty-ipaccess.xml
+++ b/jetty-server/src/main/config/etc/jetty-ipaccess.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
 
-<!-- =============================================================== --><!-- The IP Access Handler                                           --><!-- =============================================================== -->
+<!-- =============================================================== -->
+<!-- The IP Access Handler                                           -->
+<!-- =============================================================== -->
 
 <Configure id="Server" class="org.eclipse.jetty.server.Server">
   <Call name="insertHandler">
diff --git a/jetty-server/src/main/config/etc/jetty-lowresources.xml b/jetty-server/src/main/config/etc/jetty-lowresources.xml
index 8eea6a01b82..215b7b9df1b 100644
--- a/jetty-server/src/main/config/etc/jetty-lowresources.xml
+++ b/jetty-server/src/main/config/etc/jetty-lowresources.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
 
-<!-- =============================================================== --><!-- Mixin the Low Resources Monitor                                 --><!-- =============================================================== -->
+<!-- =============================================================== -->
+<!-- Mixin the Low Resources Monitor                                 -->
+<!-- =============================================================== -->
 
 <Configure id="Server" class="org.eclipse.jetty.server.Server">
   <Call name="addBean">
diff --git a/jetty-server/src/main/config/etc/jetty-requestlog.xml b/jetty-server/src/main/config/etc/jetty-requestlog.xml
index b6e202d380a..569e362dd02 100644
--- a/jetty-server/src/main/config/etc/jetty-requestlog.xml
+++ b/jetty-server/src/main/config/etc/jetty-requestlog.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
 
-<!-- =============================================================== --><!-- Configure the Jetty Request Log                                 --><!-- =============================================================== -->
+<!-- =============================================================== -->
+<!-- Configure the Jetty Request Log                                 -->
+<!-- =============================================================== -->
 <Configure id="Server" class="org.eclipse.jetty.server.Server">
 
   <!-- =========================================================== -->
diff --git a/jetty-server/src/main/config/etc/jetty-ssl-context.xml b/jetty-server/src/main/config/etc/jetty-ssl-context.xml
index 73f4458a439..e1aaa00f157 100644
--- a/jetty-server/src/main/config/etc/jetty-ssl-context.xml
+++ b/jetty-server/src/main/config/etc/jetty-ssl-context.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
 
-<!-- ============================================================= --><!-- SSL ContextFactory configuration                              --><!-- ============================================================= -->
+<!-- ============================================================= -->
+<!-- SSL ContextFactory configuration                              -->
+<!-- ============================================================= -->
 
 <!-- 
   To configure Includes / Excludes for Cipher Suites or Protocols see tweak-ssl.xml example at 
diff --git a/jetty-server/src/main/config/etc/jetty-ssl.xml b/jetty-server/src/main/config/etc/jetty-ssl.xml
index 729df2ab638..acc06daab56 100644
--- a/jetty-server/src/main/config/etc/jetty-ssl.xml
+++ b/jetty-server/src/main/config/etc/jetty-ssl.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
 
-<!-- ============================================================= --><!-- Base SSL configuration                                        --><!-- This configuration needs to be used together with 1 or more   --><!-- of jetty-https.xml or jetty-http2.xml                         --><!-- ============================================================= -->
+<!-- ============================================================= -->
+<!-- Base SSL configuration                                        -->
+<!-- This configuration needs to be used together with 1 or more   -->
+<!-- of jetty-https.xml or jetty-http2.xml                         -->
+<!-- ============================================================= -->
 <Configure id="Server" class="org.eclipse.jetty.server.Server">
 
   <!-- =========================================================== -->
diff --git a/jetty-server/src/main/config/etc/jetty-stats.xml b/jetty-server/src/main/config/etc/jetty-stats.xml
index fa00a88899c..8f695f375a0 100644
--- a/jetty-server/src/main/config/etc/jetty-stats.xml
+++ b/jetty-server/src/main/config/etc/jetty-stats.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
 
-<!-- =============================================================== --><!-- Mixin the Statistics Handler                                    --><!-- =============================================================== -->
+<!-- =============================================================== -->
+<!-- Mixin the Statistics Handler                                    -->
+<!-- =============================================================== -->
 
 <Configure id="Server" class="org.eclipse.jetty.server.Server">
   <Call name="insertHandler">
diff --git a/jetty-server/src/main/config/etc/jetty-threadlimit.xml b/jetty-server/src/main/config/etc/jetty-threadlimit.xml
index 2eecc1f66b5..a16b37cf97b 100644
--- a/jetty-server/src/main/config/etc/jetty-threadlimit.xml
+++ b/jetty-server/src/main/config/etc/jetty-threadlimit.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
 
-<!-- =============================================================== --><!-- Mixin the Thread Limit Handler to the entire server             --><!-- =============================================================== -->
+<!-- =============================================================== -->
+<!-- Mixin the Thread Limit Handler to the entire server             -->
+<!-- =============================================================== -->
 
 <Configure id="Server" class="org.eclipse.jetty.server.Server">
   <Call name="insertHandler">
diff --git a/jetty-server/src/main/config/etc/sessions/file/session-store.xml b/jetty-server/src/main/config/etc/sessions/file/session-store.xml
index 430a8917a1a..238e3b686c5 100644
--- a/jetty-server/src/main/config/etc/sessions/file/session-store.xml
+++ b/jetty-server/src/main/config/etc/sessions/file/session-store.xml
@@ -2,7 +2,6 @@
 
 <Configure id="Server" class="org.eclipse.jetty.server.Server">
 
-
   <!-- ===================================================================== -->
   <!-- Configure a factory for FileSessionStores                             -->
   <!-- ===================================================================== -->
diff --git a/jetty-server/src/main/config/etc/sessions/id-manager.xml b/jetty-server/src/main/config/etc/sessions/id-manager.xml
index 6a596ee188c..d64dad87649 100644
--- a/jetty-server/src/main/config/etc/sessions/id-manager.xml
+++ b/jetty-server/src/main/config/etc/sessions/id-manager.xml
@@ -2,7 +2,6 @@
 
 <Configure id="Server" class="org.eclipse.jetty.server.Server">
 
-
   <!-- ===================================================================== -->
   <!-- Configure a SessionIdManager                                          -->
   <!-- ===================================================================== -->
@@ -27,7 +26,7 @@
       <!-- ===================================================================== -->
       <!-- Configure a session housekeeper to help with scavenging               -->
       <!-- ===================================================================== -->
-      <Set name="sessionHouseKeeper"> 
+      <Set name="sessionHouseKeeper">
        <New class="org.eclipse.jetty.server.session.HouseKeeper">
            <Set name="intervalSec"><Property name="jetty.sessionScavengeInterval.seconds" default="600"/></Set>
        </New>
diff --git a/jetty-server/src/main/config/etc/sessions/jdbc/datasource.xml b/jetty-server/src/main/config/etc/sessions/jdbc/datasource.xml
index 06ef0203916..0fed2156e51 100644
--- a/jetty-server/src/main/config/etc/sessions/jdbc/datasource.xml
+++ b/jetty-server/src/main/config/etc/sessions/jdbc/datasource.xml
@@ -2,12 +2,11 @@
 
 <Configure id="Server" class="org.eclipse.jetty.server.Server">
 
-
-    <New id="databaseAdaptor" class="org.eclipse.jetty.server.session.DatabaseAdaptor">
-         <Set name="DatasourceName"><Property name="jetty.session.jdbc.datasourceName" default="/jdbc/sessions" /></Set>
-         <Set name="blobType"><Property name="jetty.session.jdbc.blobType"/></Set>
-         <Set name="longType"><Property name="jetty.session.jdbc.longType"/></Set>
-         <Set name="stringType"><Property name="jetty.session.jdbc.stringType"/></Set>
-    </New>
+  <New id="databaseAdaptor" class="org.eclipse.jetty.server.session.DatabaseAdaptor">
+    <Set name="DatasourceName"><Property name="jetty.session.jdbc.datasourceName" default="/jdbc/sessions" /></Set>
+    <Set name="blobType"><Property name="jetty.session.jdbc.blobType"/></Set>
+    <Set name="longType"><Property name="jetty.session.jdbc.longType"/></Set>
+    <Set name="stringType"><Property name="jetty.session.jdbc.stringType"/></Set>
+  </New>
 
 </Configure>
diff --git a/jetty-server/src/main/config/etc/sessions/jdbc/driver.xml b/jetty-server/src/main/config/etc/sessions/jdbc/driver.xml
index 05860a6885d..b6b66f3981d 100644
--- a/jetty-server/src/main/config/etc/sessions/jdbc/driver.xml
+++ b/jetty-server/src/main/config/etc/sessions/jdbc/driver.xml
@@ -2,14 +2,14 @@
 
 <Configure id="Server" class="org.eclipse.jetty.server.Server">
 
-    <New id="databaseAdaptor" class="org.eclipse.jetty.server.session.DatabaseAdaptor">
-         <Call name="setDriverInfo">
-             <Arg><Property name="jetty.session.jdbc.driverClass"/></Arg>
-             <Arg><Property name="jetty.session.jdbc.driverUrl"/></Arg>
-         </Call>
-         <Set name="blobType"><Property name="jetty.session.jdbc.blobType"/></Set>
-         <Set name="longType"><Property name="jetty.session.jdbc.longType"/></Set>
-         <Set name="stringType"><Property name="jetty.session.jdbc.stringType"/></Set>
-    </New>
+  <New id="databaseAdaptor" class="org.eclipse.jetty.server.session.DatabaseAdaptor">
+    <Call name="setDriverInfo">
+      <Arg><Property name="jetty.session.jdbc.driverClass"/></Arg>
+      <Arg><Property name="jetty.session.jdbc.driverUrl"/></Arg>
+    </Call>
+    <Set name="blobType"><Property name="jetty.session.jdbc.blobType"/></Set>
+    <Set name="longType"><Property name="jetty.session.jdbc.longType"/></Set>
+    <Set name="stringType"><Property name="jetty.session.jdbc.stringType"/></Set>
+  </New>
 
 </Configure>
diff --git a/jetty-server/src/main/config/etc/sessions/jdbc/session-store.xml b/jetty-server/src/main/config/etc/sessions/jdbc/session-store.xml
index 6a96d65f167..438c9b379a7 100644
--- a/jetty-server/src/main/config/etc/sessions/jdbc/session-store.xml
+++ b/jetty-server/src/main/config/etc/sessions/jdbc/session-store.xml
@@ -3,7 +3,6 @@
 
 <Configure id="Server" class="org.eclipse.jetty.server.Server">
 
-
   <!-- ===================================================================== -->
   <!-- Configure a factory for JDBCSessionStores                             -->
   <!-- ===================================================================== -->
@@ -13,58 +12,58 @@
       <Set name="gracePeriodSec"><Property name="jetty.session.gracePeriod.seconds" default="3600" /></Set>
       <Set name="savePeriodSec"><Property name="jetty.session.savePeriod.seconds" default="0" /></Set>
       <Set name="databaseAdaptor">
-        <Ref id="databaseAdaptor"/>
+        <Ref refid="databaseAdaptor"/>
       </Set>
-	<Set name="sessionTableSchema">
-		<New
-			class="org.eclipse.jetty.server.session.JDBCSessionDataStore$SessionTableSchema">
-			<Set name="accessTimeColumn">
-				<Property name="jetty.session.jdbc.schema.accessTimeColumn" default="accessTime" />
-			</Set>
-			<Set name="contextPathColumn">
-				<Property name="jetty.session.jdbc.schema.contextPathColumn" default="contextPath" />
-			</Set>
-			<Set name="cookieTimeColumn">
-				<Property name="jetty.session.jdbc.schema.cookieTimeColumn" default="cookieTime" />
-			</Set>
-			<Set name="createTimeColumn">
-				<Property name="jetty.session.jdbc.schema.createTimeColumn" default="createTime" />
-			</Set>
-			<Set name="expiryTimeColumn">
-				<Property name="jetty.session.jdbc.schema.expiryTimeColumn" default="expiryTime" />
-			</Set>
-			<Set name="lastAccessTimeColumn">
-				<Property name="jetty.session.jdbc.schema.lastAccessTimeColumn" default="lastAccessTime" />
-			</Set>
-			<Set name="lastSavedTimeColumn">
-				<Property name="jetty.session.jdbc.schema.lastSavedTimeColumn" default="lastSavedTime" />
-			</Set>
-			<Set name="idColumn">
-				<Property name="jetty.session.jdbc.schema.idColumn" default="sessionId" />
-			</Set>
-			<Set name="lastNodeColumn">
-				<Property name="jetty.session.jdbc.schema.lastNodeColumn" default="lastNode" />
-			</Set>
-			<Set name="virtualHostColumn">
-				<Property name="jetty.session.jdbc.schema.virtualHostColumn" default="virtualHost" />
-			</Set>
-			<Set name="maxIntervalColumn">
-				<Property name="jetty.session.jdbc.schema.maxIntervalColumn" default="maxInterval" />
-			</Set>
-			<Set name="mapColumn">
-				<Property name="jetty.session.jdbc.schema.mapColumn" default="map" />
-			</Set>
-            <Set name="schemaName">
-                <Property name="jetty.session.jdbc.schema.schemaName" />
-            </Set>
-            <Set name="catalogName">
-                <Property name="jetty.session.jdbc.schema.catalogName" />
-            </Set>
-			<Set name="tableName">
-				<Property name="jetty.session.jdbc.schema.table" default="JettySessions" />
-			</Set>
-		</New>
-	</Set>
+  <Set name="sessionTableSchema">
+    <New
+      class="org.eclipse.jetty.server.session.JDBCSessionDataStore$SessionTableSchema">
+      <Set name="accessTimeColumn">
+        <Property name="jetty.session.jdbc.schema.accessTimeColumn" default="accessTime" />
+      </Set>
+      <Set name="contextPathColumn">
+        <Property name="jetty.session.jdbc.schema.contextPathColumn" default="contextPath" />
+      </Set>
+      <Set name="cookieTimeColumn">
+        <Property name="jetty.session.jdbc.schema.cookieTimeColumn" default="cookieTime" />
+      </Set>
+      <Set name="createTimeColumn">
+        <Property name="jetty.session.jdbc.schema.createTimeColumn" default="createTime" />
+      </Set>
+      <Set name="expiryTimeColumn">
+        <Property name="jetty.session.jdbc.schema.expiryTimeColumn" default="expiryTime" />
+      </Set>
+      <Set name="lastAccessTimeColumn">
+        <Property name="jetty.session.jdbc.schema.lastAccessTimeColumn" default="lastAccessTime" />
+      </Set>
+      <Set name="lastSavedTimeColumn">
+        <Property name="jetty.session.jdbc.schema.lastSavedTimeColumn" default="lastSavedTime" />
+      </Set>
+      <Set name="idColumn">
+        <Property name="jetty.session.jdbc.schema.idColumn" default="sessionId" />
+      </Set>
+      <Set name="lastNodeColumn">
+        <Property name="jetty.session.jdbc.schema.lastNodeColumn" default="lastNode" />
+      </Set>
+      <Set name="virtualHostColumn">
+        <Property name="jetty.session.jdbc.schema.virtualHostColumn" default="virtualHost" />
+      </Set>
+      <Set name="maxIntervalColumn">
+        <Property name="jetty.session.jdbc.schema.maxIntervalColumn" default="maxInterval" />
+      </Set>
+      <Set name="mapColumn">
+        <Property name="jetty.session.jdbc.schema.mapColumn" default="map" />
+      </Set>
+      <Set name="schemaName">
+        <Property name="jetty.session.jdbc.schema.schemaName" />
+      </Set>
+      <Set name="catalogName">
+        <Property name="jetty.session.jdbc.schema.catalogName" />
+      </Set>
+      <Set name="tableName">
+        <Property name="jetty.session.jdbc.schema.table" default="JettySessions" />
+      </Set>
+    </New>
+  </Set>
     </New>
    </Arg>
   </Call>
diff --git a/jetty-server/src/main/config/etc/sessions/session-cache-hash.xml b/jetty-server/src/main/config/etc/sessions/session-cache-hash.xml
index beb537dc674..941ea1e48f3 100644
--- a/jetty-server/src/main/config/etc/sessions/session-cache-hash.xml
+++ b/jetty-server/src/main/config/etc/sessions/session-cache-hash.xml
@@ -2,21 +2,20 @@
 
 <Configure id="Server" class="org.eclipse.jetty.server.Server">
 
-
   <!-- ===================================================================== -->
   <!-- Configure a factory for DefaultSessionCache                           -->
   <!-- ===================================================================== -->
   <Call name="addBean">
-   <Arg>
-    <New class="org.eclipse.jetty.server.session.DefaultSessionCacheFactory">
-     <Set name="evictionPolicy"><Property name="jetty.session.evictionPolicy" default="-1" /></Set>
-     <Set name="saveOnInactiveEvict"><Property name="jetty.session.saveOnInactiveEvict" default="false" /></Set>
-     <Set name="saveOnCreate"><Property name="jetty.session.saveOnCreate" default="false" /></Set>
-     <Set name="removeUnloadableSessions"><Property name="jetty.session.removeUnloadableSessions" default="false"/></Set>
-     <Set name="flushOnResponseCommit"><Property name="jetty.session.flushOnResponseCommit" default="false"/></Set>
-     <Set name="invalidateOnShutdown"><Property name="jetty.session.invalidateOnShutdown" default="false"/></Set>
-    </New>
-   </Arg>
+    <Arg>
+      <New class="org.eclipse.jetty.server.session.DefaultSessionCacheFactory">
+        <Set name="evictionPolicy"><Property name="jetty.session.evictionPolicy" default="-1" /></Set>
+        <Set name="saveOnInactiveEvict"><Property name="jetty.session.saveOnInactiveEvict" default="false" /></Set>
+        <Set name="saveOnCreate"><Property name="jetty.session.saveOnCreate" default="false" /></Set>
+        <Set name="removeUnloadableSessions"><Property name="jetty.session.removeUnloadableSessions" default="false"/></Set>
+        <Set name="flushOnResponseCommit"><Property name="jetty.session.flushOnResponseCommit" default="false"/></Set>
+        <Set name="invalidateOnShutdown"><Property name="jetty.session.invalidateOnShutdown" default="false"/></Set>
+      </New>
+    </Arg>
   </Call>
 
 </Configure>
diff --git a/jetty-server/src/main/config/etc/sessions/session-cache-null.xml b/jetty-server/src/main/config/etc/sessions/session-cache-null.xml
index a9dc52b83e6..34a4343cd4c 100644
--- a/jetty-server/src/main/config/etc/sessions/session-cache-null.xml
+++ b/jetty-server/src/main/config/etc/sessions/session-cache-null.xml
@@ -2,18 +2,17 @@
 
 <Configure id="Server" class="org.eclipse.jetty.server.Server">
 
-
   <!-- ===================================================================== -->
   <!-- Configure a factory for NullSessionCache                              -->
   <!-- ===================================================================== -->
   <Call name="addBean">
-   <Arg>
-    <New class="org.eclipse.jetty.server.session.NullSessionCacheFactory">
-     <Set name="saveOnCreate"><Property name="jetty.session.saveOnCreate" default="false" /></Set>
-     <Set name="removeUnloadableSessions"><Property name="jetty.session.removeUnloadableSessions" default="false"/></Set>
-     <Set name="flushOnResponseCommit"><Property name="jetty.session.flushOnResponseCommit" default="false"/></Set>
-    </New>
-   </Arg>
+    <Arg>
+      <New class="org.eclipse.jetty.server.session.NullSessionCacheFactory">
+        <Set name="saveOnCreate"><Property name="jetty.session.saveOnCreate" default="false" /></Set>
+        <Set name="removeUnloadableSessions"><Property name="jetty.session.removeUnloadableSessions" default="false" /></Set>
+        <Set name="flushOnResponseCommit"><Property name="jetty.session.flushOnResponseCommit" default="false" /></Set>
+      </New>
+    </Arg>
   </Call>
 
 </Configure>
diff --git a/jetty-server/src/main/config/etc/sessions/session-data-cache/session-caching-store.xml b/jetty-server/src/main/config/etc/sessions/session-data-cache/session-caching-store.xml
index 29552caa696..dd5231e61ce 100644
--- a/jetty-server/src/main/config/etc/sessions/session-data-cache/session-caching-store.xml
+++ b/jetty-server/src/main/config/etc/sessions/session-data-cache/session-caching-store.xml
@@ -8,17 +8,15 @@
 
   <Call name="removeBean">
     <Arg>
-      <Ref id="sessionDataStoreFactory"/>
+      <Ref refid="sessionDataStoreFactory"/>
     </Arg>
   </Call>
 
-  
-  
   <Call name="addBean">
    <Arg>
     <New class="org.eclipse.jetty.server.session.CachingSessionDataStoreFactory">
-       <Set name="sessionStoreFactory"><Ref id="sessionDataStoreFactory"/></Set>
-       <Set name="sessionDataMapFactory"><Ref id="sessionDataMapFactory"/></Set>
+       <Set name="sessionStoreFactory"><Ref refid="sessionDataStoreFactory"/></Set>
+       <Set name="sessionDataMapFactory"><Ref refid="sessionDataMapFactory"/></Set>
     </New>
    </Arg> 
   </Call>
diff --git a/jetty-server/src/main/config/modules/inetaccess/jetty-inetaccess.xml b/jetty-server/src/main/config/modules/inetaccess/jetty-inetaccess.xml
index c5680dbeecd..6c538ea5b3a 100644
--- a/jetty-server/src/main/config/modules/inetaccess/jetty-inetaccess.xml
+++ b/jetty-server/src/main/config/modules/inetaccess/jetty-inetaccess.xml
@@ -1,38 +1,38 @@
 <?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
 
 <Configure id="Server" class="org.eclipse.jetty.server.Server">
-    <Call name="insertHandler">
-        <Arg>
-            <New id="InetAccessHandler" class="org.eclipse.jetty.server.handler.InetAccessHandler">
-                <Call name="include">
-                    <Arg>
-                        <Call class="org.eclipse.jetty.util.StringUtil" name="csvSplit">
-                            <Arg><Property name="jetty.inetaccess.include" default=""/></Arg>
-                        </Call>
-                    </Arg>
-                </Call>
-                <Call name="exclude">
-                    <Arg>
-                        <Call class="org.eclipse.jetty.util.StringUtil" name="csvSplit">
-                            <Arg><Property name="jetty.inetaccess.exclude" default=""/></Arg>
-                        </Call>
-                    </Arg>
-                </Call>
-                <Call name="includeConnectors">
-                    <Arg>
-                        <Call class="org.eclipse.jetty.util.StringUtil" name="csvSplit">
-                            <Arg><Property name="jetty.inetaccess.includeConnectors" default=""/></Arg>
-                        </Call>
-                    </Arg>
-                </Call>
-                <Call name="excludeConnectors">
-                    <Arg>
-                        <Call class="org.eclipse.jetty.util.StringUtil" name="csvSplit">
-                            <Arg><Property name="jetty.inetaccess.excludeConnectors" default=""/></Arg>
-                        </Call>
-                    </Arg>
-                </Call>
-            </New>
-        </Arg>
-    </Call>
+  <Call name="insertHandler">
+    <Arg>
+      <New id="InetAccessHandler" class="org.eclipse.jetty.server.handler.InetAccessHandler">
+        <Call name="include">
+          <Arg>
+            <Call class="org.eclipse.jetty.util.StringUtil" name="csvSplit">
+              <Arg><Property name="jetty.inetaccess.include" default="" /></Arg>
+            </Call>
+          </Arg>
+        </Call>
+        <Call name="exclude">
+          <Arg>
+            <Call class="org.eclipse.jetty.util.StringUtil" name="csvSplit">
+              <Arg><Property name="jetty.inetaccess.exclude" default="" /></Arg>
+            </Call>
+          </Arg>
+        </Call>
+        <Call name="includeConnectors">
+          <Arg>
+            <Call class="org.eclipse.jetty.util.StringUtil" name="csvSplit">
+              <Arg><Property name="jetty.inetaccess.includeConnectors" default="" /></Arg>
+            </Call>
+          </Arg>
+        </Call>
+        <Call name="excludeConnectors">
+          <Arg>
+            <Call class="org.eclipse.jetty.util.StringUtil" name="csvSplit">
+              <Arg><Property name="jetty.inetaccess.excludeConnectors" default="" /></Arg>
+            </Call>
+          </Arg>
+        </Call>
+      </New>
+    </Arg>
+  </Call>
 </Configure>
diff --git a/jetty-server/src/main/config/modules/logback-access/jetty-logback-access.xml b/jetty-server/src/main/config/modules/logback-access/jetty-logback-access.xml
index 34fbdccb7c0..cec331b1606 100644
--- a/jetty-server/src/main/config/modules/logback-access/jetty-logback-access.xml
+++ b/jetty-server/src/main/config/modules/logback-access/jetty-logback-access.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
 
-<!-- =============================================================== --><!-- Configure the Logback Request Log                               --><!-- =============================================================== -->
+<!-- =============================================================== -->
+<!-- Configure the Logback Request Log                               -->
+<!-- =============================================================== -->
 <Configure id="Server" class="org.eclipse.jetty.server.Server">
   <Set name="RequestLog">
     <New id="RequestLog" class="ch.qos.logback.access.jetty.RequestLogImpl">
diff --git a/jetty-spring/src/main/config/etc/jetty-spring.xml b/jetty-spring/src/main/config/etc/jetty-spring.xml
index ea72a385079..bb935fd361f 100644
--- a/jetty-spring/src/main/config/etc/jetty-spring.xml
+++ b/jetty-spring/src/main/config/etc/jetty-spring.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?><!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
 
-<!-- =============================================================== --><!-- Configure the Jetty Server with Spring                          --><!-- This file is the similar to jetty.xml, but written in spring    --><!-- XmlBeanFactory format.                                          --><!-- =============================================================== -->
+<!-- =============================================================== -->
+<!-- Configure the Jetty Server with Spring                          -->
+<!-- This file is the similar to jetty.xml, but written in spring    -->
+<!-- XmlBeanFactory format.                                          -->
+<!-- =============================================================== -->
 
 <beans>
 
diff --git a/tests/test-integration/src/test/resources/DefaultHandler.xml b/tests/test-integration/src/test/resources/DefaultHandler.xml
index 671af8b5735..ee2a3fac6fb 100644
--- a/tests/test-integration/src/test/resources/DefaultHandler.xml
+++ b/tests/test-integration/src/test/resources/DefaultHandler.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
 
-<!-- =============================================================== --><!-- Configure the Jetty Server                                      --><!--                                                                 --><!-- Documentation of this file format can be found at:              --><!-- http://docs.codehaus.org/display/JETTY/jetty.xml                --><!--                                                                 --><!-- =============================================================== -->
+<!-- =============================================================== -->
+<!-- Configure the Jetty Server                                      -->
+<!--                                                                 -->
+<!-- Documentation of this file format can be found at:              -->
+<!-- http://docs.codehaus.org/display/JETTY/jetty.xml                -->
+<!--                                                                 -->
+<!-- =============================================================== -->
 
 
 <Configure id="Server" class="org.eclipse.jetty.server.Server">
diff --git a/tests/test-integration/src/test/resources/RFC2616Base.xml b/tests/test-integration/src/test/resources/RFC2616Base.xml
index 3feda75ff0d..dfa62d87e05 100644
--- a/tests/test-integration/src/test/resources/RFC2616Base.xml
+++ b/tests/test-integration/src/test/resources/RFC2616Base.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
 
-<!-- =============================================================== --><!-- Configure the Jetty Server                                      --><!--                                                                 --><!-- Documentation of this file format can be found at:              --><!-- http://docs.codehaus.org/display/JETTY/jetty.xml                --><!--                                                                 --><!-- =============================================================== -->
+<!-- =============================================================== -->
+<!-- Configure the Jetty Server                                      -->
+<!--                                                                 -->
+<!-- Documentation of this file format can be found at:              -->
+<!-- http://docs.codehaus.org/display/JETTY/jetty.xml                -->
+<!--                                                                 -->
+<!-- =============================================================== -->
 
 
 <Configure id="Server" class="org.eclipse.jetty.server.Server">
diff --git a/tests/test-quickstart/src/test/resources/test-jndi.xml b/tests/test-quickstart/src/test/resources/test-jndi.xml
index 8a10be200bc..30d7f7b7b1d 100644
--- a/tests/test-quickstart/src/test/resources/test-jndi.xml
+++ b/tests/test-quickstart/src/test/resources/test-jndi.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
 
-<!-- =============================================================== --><!-- Configure the test-jndi webapp                                  --><!-- =============================================================== -->
+<!-- =============================================================== -->
+<!-- Configure the test-jndi webapp                                  -->
+<!-- =============================================================== -->
 <Configure id='wac' class="org.eclipse.jetty.webapp.WebAppContext">
 
   <New id="tx" class="org.eclipse.jetty.plus.jndi.Transaction">
diff --git a/tests/test-webapps/test-jaas-webapp/src/main/config/demo-base/webapps/test-jaas.xml b/tests/test-webapps/test-jaas-webapp/src/main/config/demo-base/webapps/test-jaas.xml
index 001f420dab0..76f74a4aade 100644
--- a/tests/test-webapps/test-jaas-webapp/src/main/config/demo-base/webapps/test-jaas.xml
+++ b/tests/test-webapps/test-jaas-webapp/src/main/config/demo-base/webapps/test-jaas.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
 
-<!-- =============================================================== --><!-- Configure the test-jaas webapp                                  --><!-- =============================================================== -->
+<!-- =============================================================== -->
+<!-- Configure the test-jaas webapp                                  -->
+<!-- =============================================================== -->
 <Configure id='wac' class="org.eclipse.jetty.webapp.WebAppContext">
 
   <Set name="contextPath">/test-jaas</Set>
diff --git a/tests/test-webapps/test-jetty-webapp/src/main/config/demo-base/etc/demo-rewrite-rules.xml b/tests/test-webapps/test-jetty-webapp/src/main/config/demo-base/etc/demo-rewrite-rules.xml
index f5524b34720..ba9033ca3d9 100644
--- a/tests/test-webapps/test-jetty-webapp/src/main/config/demo-base/etc/demo-rewrite-rules.xml
+++ b/tests/test-webapps/test-jetty-webapp/src/main/config/demo-base/etc/demo-rewrite-rules.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
 
-<!-- =============================================================== --><!-- Configure the demos                                             --><!-- =============================================================== -->
+<!-- =============================================================== -->
+<!-- Configure the demos                                             -->
+<!-- =============================================================== -->
 <Configure id="Server" class="org.eclipse.jetty.server.Server">
 
   <!-- ============================================================= -->
diff --git a/tests/test-webapps/test-jndi-webapp/src/main/templates/jetty-test-jndi-header.xml b/tests/test-webapps/test-jndi-webapp/src/main/templates/jetty-test-jndi-header.xml
index ee14078e125..ee02490a254 100644
--- a/tests/test-webapps/test-jndi-webapp/src/main/templates/jetty-test-jndi-header.xml
+++ b/tests/test-webapps/test-jndi-webapp/src/main/templates/jetty-test-jndi-header.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
 
-<!-- =============================================================== --><!-- Configure the test-jndi webapp                                  --><!-- =============================================================== -->
+<!-- =============================================================== -->
+<!-- Configure the test-jndi webapp                                  -->
+<!-- =============================================================== -->
 <Configure id='wac' class="org.eclipse.jetty.webapp.WebAppContext">
 
   <New id="tx" class="org.eclipse.jetty.plus.jndi.Transaction">
diff --git a/tests/test-webapps/test-jndi-webapp/src/main/templates/plugin-context-header.xml b/tests/test-webapps/test-jndi-webapp/src/main/templates/plugin-context-header.xml
index 476a30d2285..653811f01e8 100644
--- a/tests/test-webapps/test-jndi-webapp/src/main/templates/plugin-context-header.xml
+++ b/tests/test-webapps/test-jndi-webapp/src/main/templates/plugin-context-header.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
 
-<!-- =============================================================== --><!-- Configure the test-jndi webapp                                  --><!-- =============================================================== -->
+<!-- =============================================================== -->
+<!-- Configure the test-jndi webapp                                  -->
+<!-- =============================================================== -->
 <Configure id='wac' class="org.eclipse.jetty.webapp.WebAppContext">
 
   <New id="tx" class="org.eclipse.jetty.plus.jndi.Transaction">
diff --git a/tests/test-webapps/test-jndi-webapp/src/main/webapp/WEB-INF/jetty-env.xml b/tests/test-webapps/test-jndi-webapp/src/main/webapp/WEB-INF/jetty-env.xml
index 3889288dbaf..2d6293562f6 100644
--- a/tests/test-webapps/test-jndi-webapp/src/main/webapp/WEB-INF/jetty-env.xml
+++ b/tests/test-webapps/test-jndi-webapp/src/main/webapp/WEB-INF/jetty-env.xml
@@ -30,7 +30,7 @@
    <Arg><Ref refid='wac'/></Arg>
    <Arg>svr</Arg>
    <Arg type="java.lang.String">
-     <Ref id="Server">
+     <Ref refid="Server">
        <Get name="class">
          <Get name="name"/>
        </Get>