diff --git a/htdocs/always.php b/htdocs/always.php
index db5f1cea..e2cd1009 100644
--- a/htdocs/always.php
+++ b/htdocs/always.php
@@ -413,6 +413,7 @@ function DateToISODate( $indate ) {
 * @return integer A bit mask of the privileges.
 */
 define("DAVICAL_MAXPRIV", "65535");
+define("DAVICAL_ADDRESSBOOK_MAXPRIV", "1023");
 function privilege_to_bits( $raw_privs ) {
   $out_priv = 0;
 
@@ -452,7 +453,7 @@ function privilege_to_bits( $raw_privs ) {
   }
 
   // 'all' will include future privileges
-  if ( $out_priv >= DAVICAL_MAXPRIV ) $out_priv = pow(2,24) - 1;
+  if ( ($out_priv & DAVICAL_MAXPRIV) >= DAVICAL_MAXPRIV ) $out_priv = pow(2,24) - 1;
   return $out_priv;
 }
 
@@ -463,7 +464,7 @@ function privilege_to_bits( $raw_privs ) {
 * @param integer $raw_bits A bit mask of the privileges.
 * @return mixed The string (or array of strings) of privilege names
 */
-function bits_to_privilege( $raw_bits ) {
+function bits_to_privilege( $raw_bits, $resourcetype = 'calendar' ) {
   $out_priv = array();
 
   if ( is_string($raw_bits) ) {
@@ -477,7 +478,7 @@ function bits_to_privilege( $raw_bits ) {
   if ( ($raw_bits &  16) != 0 ) $out_priv[] = 'DAV::read-acl';
   if ( ($raw_bits &  32) != 0 ) $out_priv[] = 'DAV::read-current-user-privilege-set';
   if ( ($raw_bits & 256) != 0 ) $out_priv[] = 'DAV::write-acl';
-  if ( ($raw_bits & 512) != 0 ) $out_priv[] = 'urn:ietf:params:xml:ns:caldav:read-free-busy';
+  if ( ($resourcetype == 'calendar' || $resourcetype == 'proxy') && ($raw_bits & 512) != 0 ) $out_priv[] = 'urn:ietf:params:xml:ns:caldav:read-free-busy';
 
   if ( ($raw_bits & 198) != 0 ) {
     if ( ($raw_bits & 198) == 198 ) $out_priv[] = 'DAV::write';
@@ -487,14 +488,14 @@ function bits_to_privilege( $raw_bits ) {
     if ( ($raw_bits & 128) != 0 ) $out_priv[] = 'DAV::unbind';
   }
 
-  if ( ($raw_bits & 7168) != 0 ) {
+  if ( $resourcetype == 'schedule-inbox' && ($raw_bits & 7168) != 0 ) {
     if ( ($raw_bits & 7168) == 7168 ) $out_priv[] = 'urn:ietf:params:xml:ns:caldav:schedule-deliver';
     if ( ($raw_bits & 1024) != 0 ) $out_priv[] = 'urn:ietf:params:xml:ns:caldav:schedule-deliver-invite';
     if ( ($raw_bits & 2048) != 0 ) $out_priv[] = 'urn:ietf:params:xml:ns:caldav:schedule-deliver-reply';
     if ( ($raw_bits & 4096) != 0 ) $out_priv[] = 'urn:ietf:params:xml:ns:caldav:schedule-query-freebusy';
   }
 
-  if ( ($raw_bits & 57344) != 0 ) {
+  if ( $resourcetype == 'schedule-outbox' && ($raw_bits & 57344) != 0 ) {
     if ( ($raw_bits & 57344) == 57344 ) $out_priv[] = 'urn:ietf:params:xml:ns:caldav:schedule-send';
     if ( ($raw_bits &  8192) != 0 ) $out_priv[] = 'urn:ietf:params:xml:ns:caldav:schedule-send-invite';
     if ( ($raw_bits & 16384) != 0 ) $out_priv[] = 'urn:ietf:params:xml:ns:caldav:schedule-send-reply';
diff --git a/inc/DAVResource.php b/inc/DAVResource.php
index 37bf602f..c9b04655 100644
--- a/inc/DAVResource.php
+++ b/inc/DAVResource.php
@@ -665,7 +665,7 @@ EOQRY;
   function BuildPrivileges( $privilege_names=null, &$xmldoc=null ) {
     if ( $privilege_names == null ) {
       if ( !isset($this->privileges) ) $this->FetchPrivileges();
-      $privilege_names = bits_to_privilege($this->privileges);
+      $privilege_names = bits_to_privilege($this->privileges, ($this->_is_collection ? $this->collection->type : 'resource') );
     }
     return privileges_to_XML( $privilege_names, $xmldoc);
   }
@@ -1131,7 +1131,7 @@ EOQRY;
   * BuildACE - construct an XMLElement subtree for a DAV::ace
   */
   function BuildACE( &$xmldoc, $privs, $principal ) {
-    $privilege_names = bits_to_privilege($privs);
+    $privilege_names = bits_to_privilege($privs, ($this->_is_collection ? $this->collection->type : 'resource'));
     $privileges = array();
     foreach( $privilege_names AS $k ) {
       $privilege = new XMLElement('privilege');
diff --git a/inc/always.php.in b/inc/always.php.in
index aa6ecd70..a469a260 100644
--- a/inc/always.php.in
+++ b/inc/always.php.in
@@ -413,6 +413,7 @@ function DateToISODate( $indate ) {
 * @return integer A bit mask of the privileges.
 */
 define("DAVICAL_MAXPRIV", "65535");
+define("DAVICAL_ADDRESSBOOK_MAXPRIV", "1023");
 function privilege_to_bits( $raw_privs ) {
   $out_priv = 0;
 
@@ -452,7 +453,7 @@ function privilege_to_bits( $raw_privs ) {
   }
 
   // 'all' will include future privileges
-  if ( $out_priv >= DAVICAL_MAXPRIV ) $out_priv = pow(2,24) - 1;
+  if ( ($out_priv & DAVICAL_MAXPRIV) >= DAVICAL_MAXPRIV ) $out_priv = pow(2,24) - 1;
   return $out_priv;
 }
 
@@ -463,7 +464,7 @@ function privilege_to_bits( $raw_privs ) {
 * @param integer $raw_bits A bit mask of the privileges.
 * @return mixed The string (or array of strings) of privilege names
 */
-function bits_to_privilege( $raw_bits ) {
+function bits_to_privilege( $raw_bits, $resourcetype = 'calendar' ) {
   $out_priv = array();
 
   if ( is_string($raw_bits) ) {
@@ -477,7 +478,7 @@ function bits_to_privilege( $raw_bits ) {
   if ( ($raw_bits &  16) != 0 ) $out_priv[] = 'DAV::read-acl';
   if ( ($raw_bits &  32) != 0 ) $out_priv[] = 'DAV::read-current-user-privilege-set';
   if ( ($raw_bits & 256) != 0 ) $out_priv[] = 'DAV::write-acl';
-  if ( ($raw_bits & 512) != 0 ) $out_priv[] = 'urn:ietf:params:xml:ns:caldav:read-free-busy';
+  if ( ($resourcetype == 'calendar' || $resourcetype == 'proxy') && ($raw_bits & 512) != 0 ) $out_priv[] = 'urn:ietf:params:xml:ns:caldav:read-free-busy';
 
   if ( ($raw_bits & 198) != 0 ) {
     if ( ($raw_bits & 198) == 198 ) $out_priv[] = 'DAV::write';
@@ -487,14 +488,14 @@ function bits_to_privilege( $raw_bits ) {
     if ( ($raw_bits & 128) != 0 ) $out_priv[] = 'DAV::unbind';
   }
 
-  if ( ($raw_bits & 7168) != 0 ) {
+  if ( $resourcetype == 'schedule-inbox' && ($raw_bits & 7168) != 0 ) {
     if ( ($raw_bits & 7168) == 7168 ) $out_priv[] = 'urn:ietf:params:xml:ns:caldav:schedule-deliver';
     if ( ($raw_bits & 1024) != 0 ) $out_priv[] = 'urn:ietf:params:xml:ns:caldav:schedule-deliver-invite';
     if ( ($raw_bits & 2048) != 0 ) $out_priv[] = 'urn:ietf:params:xml:ns:caldav:schedule-deliver-reply';
     if ( ($raw_bits & 4096) != 0 ) $out_priv[] = 'urn:ietf:params:xml:ns:caldav:schedule-query-freebusy';
   }
 
-  if ( ($raw_bits & 57344) != 0 ) {
+  if ( $resourcetype == 'schedule-outbox' && ($raw_bits & 57344) != 0 ) {
     if ( ($raw_bits & 57344) == 57344 ) $out_priv[] = 'urn:ietf:params:xml:ns:caldav:schedule-send';
     if ( ($raw_bits &  8192) != 0 ) $out_priv[] = 'urn:ietf:params:xml:ns:caldav:schedule-send-invite';
     if ( ($raw_bits & 16384) != 0 ) $out_priv[] = 'urn:ietf:params:xml:ns:caldav:schedule-send-reply';
diff --git a/testing/tests/regression-suite/0000-Setup-PUT-collection-user3.result b/testing/tests/regression-suite/0000-Setup-PUT-collection-user3.result
index 1a8948fc..c8552576 100644
--- a/testing/tests/regression-suite/0000-Setup-PUT-collection-user3.result
+++ b/testing/tests/regression-suite/0000-Setup-PUT-collection-user3.result
@@ -2,7 +2,8 @@ HTTP/1.1 100 Continue
 
 HTTP/1.1 200 OK
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
 
diff --git a/testing/tests/regression-suite/0000-Setup-PUT-collection-user4.result b/testing/tests/regression-suite/0000-Setup-PUT-collection-user4.result
index 4082dd18..8d7535b1 100644
--- a/testing/tests/regression-suite/0000-Setup-PUT-collection-user4.result
+++ b/testing/tests/regression-suite/0000-Setup-PUT-collection-user4.result
@@ -2,7 +2,8 @@ HTTP/1.1 100 Continue
 
 HTTP/1.1 200 OK
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
 
diff --git a/testing/tests/regression-suite/0000-Setup-PUT-collection-user6.result b/testing/tests/regression-suite/0000-Setup-PUT-collection-user6.result
index 80264617..fcad1477 100644
--- a/testing/tests/regression-suite/0000-Setup-PUT-collection-user6.result
+++ b/testing/tests/regression-suite/0000-Setup-PUT-collection-user6.result
@@ -2,7 +2,8 @@ HTTP/1.1 100 Continue
 
 HTTP/1.1 200 OK
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
 
diff --git a/testing/tests/regression-suite/0000-Setup-PUT-collection.result b/testing/tests/regression-suite/0000-Setup-PUT-collection.result
index 3a982dbc..9563c53f 100644
--- a/testing/tests/regression-suite/0000-Setup-PUT-collection.result
+++ b/testing/tests/regression-suite/0000-Setup-PUT-collection.result
@@ -2,7 +2,8 @@ HTTP/1.1 100 Continue
 
 HTTP/1.1 200 OK
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
 
diff --git a/testing/tests/regression-suite/0001-Mulberry-1.result b/testing/tests/regression-suite/0001-Mulberry-1.result
index d0453cf9..5cc6d484 100644
--- a/testing/tests/regression-suite/0001-Mulberry-1.result
+++ b/testing/tests/regression-suite/0001-Mulberry-1.result
@@ -1,6 +1,7 @@
 HTTP/1.1 200 OK
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 Allow: OPTIONS, PROPFIND, REPORT
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
diff --git a/testing/tests/regression-suite/0002-Mulberry-1.result b/testing/tests/regression-suite/0002-Mulberry-1.result
index f2b2643e..9bafede3 100644
--- a/testing/tests/regression-suite/0002-Mulberry-1.result
+++ b/testing/tests/regression-suite/0002-Mulberry-1.result
@@ -1,6 +1,7 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 ETag: "6d1a022aa3449d59d60899df5ad10c7d"
 Content-Length: 2426
 Content-Type: text/xml; charset="utf-8"
diff --git a/testing/tests/regression-suite/0003-Mulberry-1.result b/testing/tests/regression-suite/0003-Mulberry-1.result
index e2801e40..651ef35f 100644
--- a/testing/tests/regression-suite/0003-Mulberry-1.result
+++ b/testing/tests/regression-suite/0003-Mulberry-1.result
@@ -1,6 +1,7 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 ETag: "f7655907e64525c7ecaa409f800e8f8b"
 Content-Length: 1805
 Content-Type: text/xml; charset="utf-8"
diff --git a/testing/tests/regression-suite/0004-Mulberry-1.result b/testing/tests/regression-suite/0004-Mulberry-1.result
index 41fd6e64..c1cdaa10 100644
--- a/testing/tests/regression-suite/0004-Mulberry-1.result
+++ b/testing/tests/regression-suite/0004-Mulberry-1.result
@@ -1,6 +1,7 @@
 HTTP/1.1 201 Created
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 Cache-Control: no-cache
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
diff --git a/testing/tests/regression-suite/0005-Mulberry-1.result b/testing/tests/regression-suite/0005-Mulberry-1.result
index d65ef3af..5c3a790a 100644
--- a/testing/tests/regression-suite/0005-Mulberry-1.result
+++ b/testing/tests/regression-suite/0005-Mulberry-1.result
@@ -1,6 +1,7 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 ETag: "297a698b8d8c51217f0de910462dc6d8"
 Content-Length: 2206
 Content-Type: text/xml; charset="utf-8"
diff --git a/testing/tests/regression-suite/0006-Mulberry-1.result b/testing/tests/regression-suite/0006-Mulberry-1.result
index 0c33bc97..88337c00 100644
--- a/testing/tests/regression-suite/0006-Mulberry-1.result
+++ b/testing/tests/regression-suite/0006-Mulberry-1.result
@@ -1,6 +1,7 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 ETag: "11e359b5ecf3fe8b807545812243c418"
 Content-Length: 535
 Content-Type: text/xml; charset="utf-8"
diff --git a/testing/tests/regression-suite/0007-Mulberry-1.result b/testing/tests/regression-suite/0007-Mulberry-1.result
index 715d500b..5d8de8fd 100644
--- a/testing/tests/regression-suite/0007-Mulberry-1.result
+++ b/testing/tests/regression-suite/0007-Mulberry-1.result
@@ -1,6 +1,7 @@
 HTTP/1.1 405 Method Not Allowed
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 Content-Length: 45
 Content-Type: text/plain; charset="utf-8"
 
diff --git a/testing/tests/regression-suite/0010-Mulberry-PUT-1.result b/testing/tests/regression-suite/0010-Mulberry-PUT-1.result
index 93acbdcc..1bc1a662 100644
--- a/testing/tests/regression-suite/0010-Mulberry-PUT-1.result
+++ b/testing/tests/regression-suite/0010-Mulberry-PUT-1.result
@@ -1,6 +1,7 @@
 HTTP/1.1 201 Created
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 ETag: "b000d7defa19ccb7cd21e546b54155ee"
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
diff --git a/testing/tests/regression-suite/0011-Mulberry-PUT-1b.result b/testing/tests/regression-suite/0011-Mulberry-PUT-1b.result
index 838082ab..cddea6a9 100644
--- a/testing/tests/regression-suite/0011-Mulberry-PUT-1b.result
+++ b/testing/tests/regression-suite/0011-Mulberry-PUT-1b.result
@@ -1,6 +1,7 @@
 HTTP/1.1 204 No Content
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 ETag: "557e551fae1b5c7f2131bde1ba0ba01e"
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
diff --git a/testing/tests/regression-suite/0012-Mulberry-PUT-2.result b/testing/tests/regression-suite/0012-Mulberry-PUT-2.result
index 8067ffc8..62d40f1f 100644
--- a/testing/tests/regression-suite/0012-Mulberry-PUT-2.result
+++ b/testing/tests/regression-suite/0012-Mulberry-PUT-2.result
@@ -1,6 +1,7 @@
 HTTP/1.1 201 Created
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 ETag: "22158fc45876987b2b00749a3a1684d8"
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
diff --git a/testing/tests/regression-suite/0013-Mulberry-PROPFIND-5.result b/testing/tests/regression-suite/0013-Mulberry-PROPFIND-5.result
index 26fac1ce..fa060819 100644
--- a/testing/tests/regression-suite/0013-Mulberry-PROPFIND-5.result
+++ b/testing/tests/regression-suite/0013-Mulberry-PROPFIND-5.result
@@ -1,6 +1,7 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 ETag: "0e8180a5a3677b7b3e2156a8053882fe"
 Content-Length: 1124
 Content-Type: text/xml; charset="utf-8"
diff --git a/testing/tests/regression-suite/0014-Mulberry-PUT-3.result b/testing/tests/regression-suite/0014-Mulberry-PUT-3.result
index e53179a7..83c0a69f 100644
--- a/testing/tests/regression-suite/0014-Mulberry-PUT-3.result
+++ b/testing/tests/regression-suite/0014-Mulberry-PUT-3.result
@@ -1,6 +1,7 @@
 HTTP/1.1 204 No Content
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 ETag: "2c32a2f8aba853654eb17fe037a4db4d"
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
diff --git a/testing/tests/regression-suite/0015-Mulberry-PROPFIND-6.result b/testing/tests/regression-suite/0015-Mulberry-PROPFIND-6.result
index 3c8bab52..337cf69b 100644
--- a/testing/tests/regression-suite/0015-Mulberry-PROPFIND-6.result
+++ b/testing/tests/regression-suite/0015-Mulberry-PROPFIND-6.result
@@ -1,6 +1,7 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 ETag: "5fec6bf01e8802ec9facdb7adc7ab93f"
 Content-Length: 1124
 Content-Type: text/xml; charset="utf-8"
diff --git a/testing/tests/regression-suite/0016-Mulberry-MKCALENDAR-3.result b/testing/tests/regression-suite/0016-Mulberry-MKCALENDAR-3.result
index 41fd6e64..c1cdaa10 100644
--- a/testing/tests/regression-suite/0016-Mulberry-MKCALENDAR-3.result
+++ b/testing/tests/regression-suite/0016-Mulberry-MKCALENDAR-3.result
@@ -1,6 +1,7 @@
 HTTP/1.1 201 Created
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 Cache-Control: no-cache
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
diff --git a/testing/tests/regression-suite/0017-Mulberry-MKCALENDAR-4.result b/testing/tests/regression-suite/0017-Mulberry-MKCALENDAR-4.result
index 4b49e9b9..e1c7270e 100644
--- a/testing/tests/regression-suite/0017-Mulberry-MKCALENDAR-4.result
+++ b/testing/tests/regression-suite/0017-Mulberry-MKCALENDAR-4.result
@@ -1,6 +1,7 @@
 HTTP/1.1 403 Forbidden
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 Content-Length: 219
 Content-Type: text/xml; charset="utf-8"
 
diff --git a/testing/tests/regression-suite/0018-Mulberry-PUT-4.result b/testing/tests/regression-suite/0018-Mulberry-PUT-4.result
index c267806b..db601185 100644
--- a/testing/tests/regression-suite/0018-Mulberry-PUT-4.result
+++ b/testing/tests/regression-suite/0018-Mulberry-PUT-4.result
@@ -1,6 +1,7 @@
 HTTP/1.1 201 Created
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 ETag: "75a75e1c7c4546074aab7645b5323738"
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
diff --git a/testing/tests/regression-suite/0019-Mulberry-OPTIONS-3.result b/testing/tests/regression-suite/0019-Mulberry-OPTIONS-3.result
index bd794119..98f244b2 100644
--- a/testing/tests/regression-suite/0019-Mulberry-OPTIONS-3.result
+++ b/testing/tests/regression-suite/0019-Mulberry-OPTIONS-3.result
@@ -1,6 +1,7 @@
 HTTP/1.1 400 Bad Request
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 Content-Length: 46
 Content-Type: text/plain; charset="utf-8"
 
diff --git a/testing/tests/regression-suite/0020-Mulberry-DELETE-1.result b/testing/tests/regression-suite/0020-Mulberry-DELETE-1.result
index 7b1220a6..565dfe06 100644
--- a/testing/tests/regression-suite/0020-Mulberry-DELETE-1.result
+++ b/testing/tests/regression-suite/0020-Mulberry-DELETE-1.result
@@ -1,6 +1,7 @@
 HTTP/1.1 412 Precondition Failed
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 Content-Length: 44
 Content-Type: text/plain; charset="utf-8"
 
diff --git a/testing/tests/regression-suite/0021-Mulberry-DELETE-2.result b/testing/tests/regression-suite/0021-Mulberry-DELETE-2.result
index a48975c9..86ec884a 100644
--- a/testing/tests/regression-suite/0021-Mulberry-DELETE-2.result
+++ b/testing/tests/regression-suite/0021-Mulberry-DELETE-2.result
@@ -1,6 +1,7 @@
 HTTP/1.1 204 No Content
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
 
diff --git a/testing/tests/regression-suite/0022-Mulberry-PUT-5.result b/testing/tests/regression-suite/0022-Mulberry-PUT-5.result
index 81b3ab9b..32f5c5e9 100644
--- a/testing/tests/regression-suite/0022-Mulberry-PUT-5.result
+++ b/testing/tests/regression-suite/0022-Mulberry-PUT-5.result
@@ -1,6 +1,7 @@
 HTTP/1.1 201 Created
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 ETag: "81979ab45975368d619171a4c3e1e5e2"
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
diff --git a/testing/tests/regression-suite/0023-Mulberry-DELETE-3.result b/testing/tests/regression-suite/0023-Mulberry-DELETE-3.result
index a48975c9..86ec884a 100644
--- a/testing/tests/regression-suite/0023-Mulberry-DELETE-3.result
+++ b/testing/tests/regression-suite/0023-Mulberry-DELETE-3.result
@@ -1,6 +1,7 @@
 HTTP/1.1 204 No Content
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
 
diff --git a/testing/tests/regression-suite/0099-REPORT-sync-initial.result b/testing/tests/regression-suite/0099-REPORT-sync-initial.result
index 39725e94..2e600cc0 100644
--- a/testing/tests/regression-suite/0099-REPORT-sync-initial.result
+++ b/testing/tests/regression-suite/0099-REPORT-sync-initial.result
@@ -1,6 +1,7 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 ETag: "d668266633188d6d2690a2eb491bba0c"
 Content-Length: 404
 Content-Type: text/xml; charset="utf-8"
diff --git a/testing/tests/regression-suite/0101-Evo-OPTIONS-1.result b/testing/tests/regression-suite/0101-Evo-OPTIONS-1.result
index e8f7826b..1c685563 100644
--- a/testing/tests/regression-suite/0101-Evo-OPTIONS-1.result
+++ b/testing/tests/regression-suite/0101-Evo-OPTIONS-1.result
@@ -1,6 +1,7 @@
 HTTP/1.1 200 OK
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 Allow: OPTIONS, PROPFIND, REPORT, DELETE, LOCK, UNLOCK, MOVE, GET, PUT, HEAD, MKTICKET, DELTICKET
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
diff --git a/testing/tests/regression-suite/0102-Evo-REPORT-1.result b/testing/tests/regression-suite/0102-Evo-REPORT-1.result
index 758698f3..998019d7 100644
--- a/testing/tests/regression-suite/0102-Evo-REPORT-1.result
+++ b/testing/tests/regression-suite/0102-Evo-REPORT-1.result
@@ -1,6 +1,7 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 ETag: "5d903e7367fc5fd8975cd2a2f12c94ef"
 Content-Length: 326
 Content-Type: text/xml; charset="utf-8"
diff --git a/testing/tests/regression-suite/0103-Evo-GET-1.result b/testing/tests/regression-suite/0103-Evo-GET-1.result
index e62c3311..d46c59a2 100644
--- a/testing/tests/regression-suite/0103-Evo-GET-1.result
+++ b/testing/tests/regression-suite/0103-Evo-GET-1.result
@@ -1,6 +1,7 @@
 HTTP/1.1 200 OK
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 Etag: "2c32a2f8aba853654eb17fe037a4db4d"
 Content-Length: 747
 Content-Type: text/calendar; charset="utf-8"
diff --git a/testing/tests/regression-suite/0104-Evo-PUT-1.result b/testing/tests/regression-suite/0104-Evo-PUT-1.result
index 236c35c3..f9abd463 100644
--- a/testing/tests/regression-suite/0104-Evo-PUT-1.result
+++ b/testing/tests/regression-suite/0104-Evo-PUT-1.result
@@ -2,7 +2,8 @@ HTTP/1.1 100 Continue
 
 HTTP/1.1 201 Created
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 ETag: "c3658901fd4689d4a1e1d6f08601ef4f"
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
diff --git a/testing/tests/regression-suite/0105-Evo-REPORT-1.result b/testing/tests/regression-suite/0105-Evo-REPORT-1.result
index 50d84382..cecf13fb 100644
--- a/testing/tests/regression-suite/0105-Evo-REPORT-1.result
+++ b/testing/tests/regression-suite/0105-Evo-REPORT-1.result
@@ -1,6 +1,7 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 ETag: "ca51ab493acbf1f9847c2cd95ef33026"
 Content-Length: 552
 Content-Type: text/xml; charset="utf-8"
diff --git a/testing/tests/regression-suite/0106-Evo-GET-1.result b/testing/tests/regression-suite/0106-Evo-GET-1.result
index b7734ae9..091e833b 100644
--- a/testing/tests/regression-suite/0106-Evo-GET-1.result
+++ b/testing/tests/regression-suite/0106-Evo-GET-1.result
@@ -1,6 +1,7 @@
 HTTP/1.1 200 OK
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 Etag: "c3658901fd4689d4a1e1d6f08601ef4f"
 Content-Length: 1059
 Content-Type: text/calendar; charset="utf-8"
diff --git a/testing/tests/regression-suite/0107-Evo-REPORT-1.result b/testing/tests/regression-suite/0107-Evo-REPORT-1.result
index 072c2374..8b8d8369 100644
--- a/testing/tests/regression-suite/0107-Evo-REPORT-1.result
+++ b/testing/tests/regression-suite/0107-Evo-REPORT-1.result
@@ -1,6 +1,7 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 ETag: "060f992b9ee715662940929074dc1f57"
 Content-Length: 530
 Content-Type: text/xml; charset="utf-8"
diff --git a/testing/tests/regression-suite/0108-Evo-REPORT-1.result b/testing/tests/regression-suite/0108-Evo-REPORT-1.result
index d1064781..1adf5327 100644
--- a/testing/tests/regression-suite/0108-Evo-REPORT-1.result
+++ b/testing/tests/regression-suite/0108-Evo-REPORT-1.result
@@ -1,6 +1,7 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 ETag: "e68750266884dbc4ee9f96f85a8dc39c"
 Content-Length: 568
 Content-Type: text/xml; charset="utf-8"
diff --git a/testing/tests/regression-suite/0201-Moz-OPTIONS-2.result b/testing/tests/regression-suite/0201-Moz-OPTIONS-2.result
index 16392cee..be1fbe30 100644
--- a/testing/tests/regression-suite/0201-Moz-OPTIONS-2.result
+++ b/testing/tests/regression-suite/0201-Moz-OPTIONS-2.result
@@ -1,6 +1,7 @@
 HTTP/1.1 200 OK
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook
 Allow: OPTIONS, PROPFIND, REPORT, DELETE, LOCK, UNLOCK, MOVE, GET, PUT, HEAD, MKTICKET, DELTICKET
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
diff --git a/testing/tests/regression-suite/0203-Moz-REPORT-2.result b/testing/tests/regression-suite/0203-Moz-REPORT-2.result
index bfe64123..c376b11e 100644
--- a/testing/tests/regression-suite/0203-Moz-REPORT-2.result
+++ b/testing/tests/regression-suite/0203-Moz-REPORT-2.result
@@ -1,6 +1,7 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook
 ETag: "29e2f219a0c62c391b207758292e7aef"
 Content-Length: 2362
 Content-Type: text/xml; charset="utf-8"
diff --git a/testing/tests/regression-suite/0204-Moz-REPORT-3.result b/testing/tests/regression-suite/0204-Moz-REPORT-3.result
index 99bea40d..7566938e 100644
--- a/testing/tests/regression-suite/0204-Moz-REPORT-3.result
+++ b/testing/tests/regression-suite/0204-Moz-REPORT-3.result
@@ -1,6 +1,7 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook
 ETag: "8499ce6e92d129b549025ba6ceabe941"
 Content-Length: 1101
 Content-Type: text/xml; charset="utf-8"
diff --git a/testing/tests/regression-suite/0205-Moz-PROPFIND-1.result b/testing/tests/regression-suite/0205-Moz-PROPFIND-1.result
index 1bca344e..d66b54d7 100644
--- a/testing/tests/regression-suite/0205-Moz-PROPFIND-1.result
+++ b/testing/tests/regression-suite/0205-Moz-PROPFIND-1.result
@@ -1,6 +1,7 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook
 ETag: "334c8abc0ac73261cdbf963fc7269d76"
 Content-Length: 347
 Content-Type: text/xml; charset="utf-8"
diff --git a/testing/tests/regression-suite/0206-Moz-PUT-1.result b/testing/tests/regression-suite/0206-Moz-PUT-1.result
index 208d7218..1ce2e799 100644
--- a/testing/tests/regression-suite/0206-Moz-PUT-1.result
+++ b/testing/tests/regression-suite/0206-Moz-PUT-1.result
@@ -1,6 +1,7 @@
 HTTP/1.1 201 Created
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 ETag: "a1c6404d61190f9574e2bfd69383f144"
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
diff --git a/testing/tests/regression-suite/0207-Moz-REPORT-4.result b/testing/tests/regression-suite/0207-Moz-REPORT-4.result
index 45c5798b..f819c751 100644
--- a/testing/tests/regression-suite/0207-Moz-REPORT-4.result
+++ b/testing/tests/regression-suite/0207-Moz-REPORT-4.result
@@ -1,6 +1,7 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 ETag: "cb43f2c3842d4c779d06f3790a43a067"
 Content-Length: 1349
 Content-Type: text/xml; charset="utf-8"
diff --git a/testing/tests/regression-suite/0208-Moz-REPORT-5.result b/testing/tests/regression-suite/0208-Moz-REPORT-5.result
index 10e48a38..f1266fe6 100644
--- a/testing/tests/regression-suite/0208-Moz-REPORT-5.result
+++ b/testing/tests/regression-suite/0208-Moz-REPORT-5.result
@@ -1,6 +1,7 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook
 ETag: "cb43f2c3842d4c779d06f3790a43a067"
 Content-Length: 1349
 Content-Type: text/xml; charset="utf-8"
diff --git a/testing/tests/regression-suite/0209-Moz-PUT-CONFIDENTIAL.result b/testing/tests/regression-suite/0209-Moz-PUT-CONFIDENTIAL.result
index 533e41a2..8665f9f8 100644
--- a/testing/tests/regression-suite/0209-Moz-PUT-CONFIDENTIAL.result
+++ b/testing/tests/regression-suite/0209-Moz-PUT-CONFIDENTIAL.result
@@ -1,6 +1,7 @@
 HTTP/1.1 201 Created
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook
 ETag: "08a435c2abaf38f4a50a997343c098a7"
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
diff --git a/testing/tests/regression-suite/0210-Moz-PUT-PRIVATE.result b/testing/tests/regression-suite/0210-Moz-PUT-PRIVATE.result
index 1a79a745..8aa8d7c9 100644
--- a/testing/tests/regression-suite/0210-Moz-PUT-PRIVATE.result
+++ b/testing/tests/regression-suite/0210-Moz-PUT-PRIVATE.result
@@ -1,6 +1,7 @@
 HTTP/1.1 201 Created
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook
 ETag: "5def8ae2b20893a1c7f4dbaeb008f2f1"
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
diff --git a/testing/tests/regression-suite/0211-Moz-PUT-TENTATIVE.result b/testing/tests/regression-suite/0211-Moz-PUT-TENTATIVE.result
index d9603c02..f6ed3ab9 100644
--- a/testing/tests/regression-suite/0211-Moz-PUT-TENTATIVE.result
+++ b/testing/tests/regression-suite/0211-Moz-PUT-TENTATIVE.result
@@ -1,6 +1,7 @@
 HTTP/1.1 201 Created
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook
 ETag: "ac90acd649c25070b1a2a17fb31a105a"
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
diff --git a/testing/tests/regression-suite/0212-Moz-PROPFIND.result b/testing/tests/regression-suite/0212-Moz-PROPFIND.result
index d2e9c1a1..06ccbbc8 100644
--- a/testing/tests/regression-suite/0212-Moz-PROPFIND.result
+++ b/testing/tests/regression-suite/0212-Moz-PROPFIND.result
@@ -1,6 +1,7 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook
 Content-Location: /caldav.php/user1/home/
 ETag: "334c8abc0ac73261cdbf963fc7269d76"
 Content-Length: 347
diff --git a/testing/tests/regression-suite/0213-Moz-MKCALENDAR.result b/testing/tests/regression-suite/0213-Moz-MKCALENDAR.result
index 160ec1c4..cf43dbc4 100644
--- a/testing/tests/regression-suite/0213-Moz-MKCALENDAR.result
+++ b/testing/tests/regression-suite/0213-Moz-MKCALENDAR.result
@@ -1,6 +1,7 @@
 HTTP/1.1 201 Created
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook
 Cache-Control: no-cache
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
diff --git a/testing/tests/regression-suite/0214-Moz-PUT-New-Task.result b/testing/tests/regression-suite/0214-Moz-PUT-New-Task.result
index d690c243..b220fa6e 100644
--- a/testing/tests/regression-suite/0214-Moz-PUT-New-Task.result
+++ b/testing/tests/regression-suite/0214-Moz-PUT-New-Task.result
@@ -1,6 +1,7 @@
 HTTP/1.1 201 Created
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook
 ETag: "509b0f0d8a3363379f9f5727f5dd74a0"
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
diff --git a/testing/tests/regression-suite/0215-Moz-PUT-InProgress-Task.result b/testing/tests/regression-suite/0215-Moz-PUT-InProgress-Task.result
index 856305a6..549b0d65 100644
--- a/testing/tests/regression-suite/0215-Moz-PUT-InProgress-Task.result
+++ b/testing/tests/regression-suite/0215-Moz-PUT-InProgress-Task.result
@@ -1,6 +1,7 @@
 HTTP/1.1 201 Created
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook
 ETag: "cb3d9dc3e8c157f53eba3ea0e1e0f146"
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
diff --git a/testing/tests/regression-suite/0216-Moz-PUT-Completed-Task.result b/testing/tests/regression-suite/0216-Moz-PUT-Completed-Task.result
index 087c4e63..be6c8b99 100644
--- a/testing/tests/regression-suite/0216-Moz-PUT-Completed-Task.result
+++ b/testing/tests/regression-suite/0216-Moz-PUT-Completed-Task.result
@@ -1,6 +1,7 @@
 HTTP/1.1 201 Created
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook
 ETag: "00ad5eb1eb5507884710b0b66aa5d5c4"
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
diff --git a/testing/tests/regression-suite/0217-Moz-PUT-Cancelled-Task.result b/testing/tests/regression-suite/0217-Moz-PUT-Cancelled-Task.result
index 74bfc24d..15f6050c 100644
--- a/testing/tests/regression-suite/0217-Moz-PUT-Cancelled-Task.result
+++ b/testing/tests/regression-suite/0217-Moz-PUT-Cancelled-Task.result
@@ -1,6 +1,7 @@
 HTTP/1.1 201 Created
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook
 ETag: "a2990674708634a311bb98a59865ca50"
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
diff --git a/testing/tests/regression-suite/0218-Moz-REPORT.result b/testing/tests/regression-suite/0218-Moz-REPORT.result
index 4b23c647..fb357ead 100644
--- a/testing/tests/regression-suite/0218-Moz-REPORT.result
+++ b/testing/tests/regression-suite/0218-Moz-REPORT.result
@@ -1,6 +1,7 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 ETag: "452f45250e12e66d9f6db823b4615a48"
 Content-Length: 3503
 Content-Type: text/xml; charset="utf-8"
diff --git a/testing/tests/regression-suite/0219-Moz-REPORT.result b/testing/tests/regression-suite/0219-Moz-REPORT.result
index 38d92b82..11acd203 100644
--- a/testing/tests/regression-suite/0219-Moz-REPORT.result
+++ b/testing/tests/regression-suite/0219-Moz-REPORT.result
@@ -1,6 +1,7 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook
 ETag: "452f45250e12e66d9f6db823b4615a48"
 Content-Length: 3503
 Content-Type: text/xml; charset="utf-8"
diff --git a/testing/tests/regression-suite/0220-Moz-REPORT.result b/testing/tests/regression-suite/0220-Moz-REPORT.result
index a79f0e4b..fcf932b4 100644
--- a/testing/tests/regression-suite/0220-Moz-REPORT.result
+++ b/testing/tests/regression-suite/0220-Moz-REPORT.result
@@ -1,6 +1,7 @@
 HTTP/1.1 406 Not Acceptable
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook
 Content-Length: 33
 Content-Type: text/plain; charset="utf-8"
 
diff --git a/testing/tests/regression-suite/0221-Moz-PROPFIND.result b/testing/tests/regression-suite/0221-Moz-PROPFIND.result
index 8120c07b..01595e1d 100644
--- a/testing/tests/regression-suite/0221-Moz-PROPFIND.result
+++ b/testing/tests/regression-suite/0221-Moz-PROPFIND.result
@@ -1,6 +1,7 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook
 ETag: "Looks like a good ETAG to me :-)"
 Content-Length: 514
 Content-Type: text/xml; charset="utf-8"
diff --git a/testing/tests/regression-suite/0230-Moz-REPORT-Tasks-Completed.result b/testing/tests/regression-suite/0230-Moz-REPORT-Tasks-Completed.result
index 4911cb51..7537bfd0 100644
--- a/testing/tests/regression-suite/0230-Moz-REPORT-Tasks-Completed.result
+++ b/testing/tests/regression-suite/0230-Moz-REPORT-Tasks-Completed.result
@@ -1,6 +1,7 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook
 ETag: "8bfa1d55385dd1c0d877ba64358b56d4"
 Content-Length: 1574
 Content-Type: text/xml; charset="utf-8"
diff --git a/testing/tests/regression-suite/0231-Moz-REPORT-All-Tasks.result b/testing/tests/regression-suite/0231-Moz-REPORT-All-Tasks.result
index e75aa28c..a15dc18d 100644
--- a/testing/tests/regression-suite/0231-Moz-REPORT-All-Tasks.result
+++ b/testing/tests/regression-suite/0231-Moz-REPORT-All-Tasks.result
@@ -1,6 +1,7 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook
 ETag: "ed088ba2e3b2a1de74167f7a96c8c07c"
 Content-Length: 4124
 Content-Type: text/xml; charset="utf-8"
diff --git a/testing/tests/regression-suite/0232-Moz-PROPFIND.result b/testing/tests/regression-suite/0232-Moz-PROPFIND.result
index 1bca344e..d66b54d7 100644
--- a/testing/tests/regression-suite/0232-Moz-PROPFIND.result
+++ b/testing/tests/regression-suite/0232-Moz-PROPFIND.result
@@ -1,6 +1,7 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook
 ETag: "334c8abc0ac73261cdbf963fc7269d76"
 Content-Length: 347
 Content-Type: text/xml; charset="utf-8"
diff --git a/testing/tests/regression-suite/0233-Moz-PUT.result b/testing/tests/regression-suite/0233-Moz-PUT.result
index e7464443..f2a0701d 100644
--- a/testing/tests/regression-suite/0233-Moz-PUT.result
+++ b/testing/tests/regression-suite/0233-Moz-PUT.result
@@ -2,7 +2,8 @@ HTTP/1.1 100 Continue
 
 HTTP/1.1 201 Created
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook
 ETag: "e8060931f30c1798ac58ffbe4ec0bffc"
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
diff --git a/testing/tests/regression-suite/0234-Moz-PUT.result b/testing/tests/regression-suite/0234-Moz-PUT.result
index 2ff6c823..43254ead 100644
--- a/testing/tests/regression-suite/0234-Moz-PUT.result
+++ b/testing/tests/regression-suite/0234-Moz-PUT.result
@@ -1,6 +1,7 @@
 HTTP/1.1 201 Created
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook
 ETag: "8f581a053df6d833254756dfd7553d37"
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
diff --git a/testing/tests/regression-suite/0235-Moz-REPORT.result b/testing/tests/regression-suite/0235-Moz-REPORT.result
index d4a7245f..7fa6e7fa 100644
--- a/testing/tests/regression-suite/0235-Moz-REPORT.result
+++ b/testing/tests/regression-suite/0235-Moz-REPORT.result
@@ -1,6 +1,7 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook
 ETag: "7c1cd3dd9aa20bfd2ce309046cdff993"
 Content-Length: 1527
 Content-Type: text/xml; charset="utf-8"
diff --git a/testing/tests/regression-suite/0236-Moz-REPORT.result b/testing/tests/regression-suite/0236-Moz-REPORT.result
index 02d76e72..1f80a613 100644
--- a/testing/tests/regression-suite/0236-Moz-REPORT.result
+++ b/testing/tests/regression-suite/0236-Moz-REPORT.result
@@ -1,6 +1,7 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook
 ETag: "882eeadb4b2e998ed4358acda515e963"
 Content-Length: 1421
 Content-Type: text/xml; charset="utf-8"
diff --git a/testing/tests/regression-suite/0240-Moz-PROPFIND-sub.result b/testing/tests/regression-suite/0240-Moz-PROPFIND-sub.result
index 7873501a..598555ba 100644
--- a/testing/tests/regression-suite/0240-Moz-PROPFIND-sub.result
+++ b/testing/tests/regression-suite/0240-Moz-PROPFIND-sub.result
@@ -1,6 +1,7 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook
 ETag: "0df5049284c13eae94d8f8ddc52d521b"
 Content-Length: 739
 Content-Type: text/xml; charset="utf-8"
diff --git a/testing/tests/regression-suite/0240-Moz-PROPFIND.result b/testing/tests/regression-suite/0240-Moz-PROPFIND.result
index cf0edcaa..e9a08ef0 100644
--- a/testing/tests/regression-suite/0240-Moz-PROPFIND.result
+++ b/testing/tests/regression-suite/0240-Moz-PROPFIND.result
@@ -1,6 +1,7 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook
 ETag: "9b84304066ad932fa860037c4905711a"
 Content-Length: 699
 Content-Type: text/xml; charset="utf-8"
diff --git a/testing/tests/regression-suite/0241-Moz-REPORT.result b/testing/tests/regression-suite/0241-Moz-REPORT.result
index b9e88cdc..c0a6a155 100644
--- a/testing/tests/regression-suite/0241-Moz-REPORT.result
+++ b/testing/tests/regression-suite/0241-Moz-REPORT.result
@@ -1,6 +1,7 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook
 ETag: "07474790757c5e1b526ce4901889d6d3"
 Content-Length: 68
 Content-Type: text/xml; charset="utf-8"
diff --git a/testing/tests/regression-suite/0242-Moz-REPORT.result b/testing/tests/regression-suite/0242-Moz-REPORT.result
index acae321e..3d882b33 100644
--- a/testing/tests/regression-suite/0242-Moz-REPORT.result
+++ b/testing/tests/regression-suite/0242-Moz-REPORT.result
@@ -1,6 +1,7 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook
 ETag: "07474790757c5e1b526ce4901889d6d3"
 Content-Length: 68
 Content-Type: text/xml; charset="utf-8"
diff --git a/testing/tests/regression-suite/0245-Moz-POST-FB.result b/testing/tests/regression-suite/0245-Moz-POST-FB.result
index d1677c06..8079ba2f 100644
--- a/testing/tests/regression-suite/0245-Moz-POST-FB.result
+++ b/testing/tests/regression-suite/0245-Moz-POST-FB.result
@@ -1,6 +1,7 @@
 HTTP/1.1 200 OK
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook
 ETag: "some valid etag"
 Content-Length: 967
 Content-Type: text/xml; charset="utf-8"
diff --git a/testing/tests/regression-suite/0246-Moz-POST-FB.result b/testing/tests/regression-suite/0246-Moz-POST-FB.result
index 2213201f..228fc01c 100644
--- a/testing/tests/regression-suite/0246-Moz-POST-FB.result
+++ b/testing/tests/regression-suite/0246-Moz-POST-FB.result
@@ -1,6 +1,7 @@
 HTTP/1.1 200 OK
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook
 ETag: "1ae0716c07a40eb2663762d423506624"
 Content-Length: 335
 Content-Type: text/xml; charset="utf-8"
diff --git a/testing/tests/regression-suite/0302-Chandler-OPTIONS-2.result b/testing/tests/regression-suite/0302-Chandler-OPTIONS-2.result
index e8f7826b..1c685563 100644
--- a/testing/tests/regression-suite/0302-Chandler-OPTIONS-2.result
+++ b/testing/tests/regression-suite/0302-Chandler-OPTIONS-2.result
@@ -1,6 +1,7 @@
 HTTP/1.1 200 OK
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 Allow: OPTIONS, PROPFIND, REPORT, DELETE, LOCK, UNLOCK, MOVE, GET, PUT, HEAD, MKTICKET, DELTICKET
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
diff --git a/testing/tests/regression-suite/0303-Chandler-PROPFIND-1.result b/testing/tests/regression-suite/0303-Chandler-PROPFIND-1.result
index 6ba5ea5b..2d8e2a95 100644
--- a/testing/tests/regression-suite/0303-Chandler-PROPFIND-1.result
+++ b/testing/tests/regression-suite/0303-Chandler-PROPFIND-1.result
@@ -1,6 +1,7 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 ETag: "61420f7d691185526594a0de01390d2f"
 Content-Length: 495
 Content-Type: text/xml; charset="utf-8"
diff --git a/testing/tests/regression-suite/0304-Chandler-PROPFIND-2.result b/testing/tests/regression-suite/0304-Chandler-PROPFIND-2.result
index f9145329..0cd2709c 100644
--- a/testing/tests/regression-suite/0304-Chandler-PROPFIND-2.result
+++ b/testing/tests/regression-suite/0304-Chandler-PROPFIND-2.result
@@ -1,8 +1,9 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
-ETag: "7db106b1d8af7d7dbc29599051f440b6"
-Content-Length: 1757
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+ETag: "53e2a5d2cabcd630996fc1f50f0bf094"
+Content-Length: 1223
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
@@ -48,30 +49,6 @@ Content-Type: text/xml; charset="utf-8"
      <privilege>
       <unbind/>
      </privilege>
-     <privilege>
-      <C:schedule-deliver/>
-     </privilege>
-     <privilege>
-      <C:schedule-deliver-invite/>
-     </privilege>
-     <privilege>
-      <C:schedule-deliver-reply/>
-     </privilege>
-     <privilege>
-      <C:schedule-query-freebusy/>
-     </privilege>
-     <privilege>
-      <C:schedule-send/>
-     </privilege>
-     <privilege>
-      <C:schedule-send-invite/>
-     </privilege>
-     <privilege>
-      <C:schedule-send-reply/>
-     </privilege>
-     <privilege>
-      <C:schedule-send-freebusy/>
-     </privilege>
     </current-user-privilege-set>
     <resourcetype>
      <collection/>
diff --git a/testing/tests/regression-suite/0305-Chandler-MKCOL-1.result b/testing/tests/regression-suite/0305-Chandler-MKCOL-1.result
index e571873b..1138d97b 100644
--- a/testing/tests/regression-suite/0305-Chandler-MKCOL-1.result
+++ b/testing/tests/regression-suite/0305-Chandler-MKCOL-1.result
@@ -1,6 +1,7 @@
 HTTP/1.1 201 Created
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 Cache-Control: no-cache
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
diff --git a/testing/tests/regression-suite/0306-Chandler-DELETE-1.result b/testing/tests/regression-suite/0306-Chandler-DELETE-1.result
index dd246315..3d2c04b5 100644
--- a/testing/tests/regression-suite/0306-Chandler-DELETE-1.result
+++ b/testing/tests/regression-suite/0306-Chandler-DELETE-1.result
@@ -1,6 +1,7 @@
 HTTP/1.1 204 No Content
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
 
diff --git a/testing/tests/regression-suite/0308-Chandler-OPTIONS-3.result b/testing/tests/regression-suite/0308-Chandler-OPTIONS-3.result
index 6c72fab8..8e7264d0 100644
--- a/testing/tests/regression-suite/0308-Chandler-OPTIONS-3.result
+++ b/testing/tests/regression-suite/0308-Chandler-OPTIONS-3.result
@@ -1,6 +1,7 @@
 HTTP/1.1 404 Not Found
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 Content-Length: 37
 Content-Type: text/plain; charset="utf-8"
 
diff --git a/testing/tests/regression-suite/0309-Chandler-PROPFIND-3.result b/testing/tests/regression-suite/0309-Chandler-PROPFIND-3.result
index c777f922..9b0ac0ae 100644
--- a/testing/tests/regression-suite/0309-Chandler-PROPFIND-3.result
+++ b/testing/tests/regression-suite/0309-Chandler-PROPFIND-3.result
@@ -1,6 +1,7 @@
 HTTP/1.1 404 Not Found
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 Content-Length: 44
 Content-Type: text/plain; charset="utf-8"
 
diff --git a/testing/tests/regression-suite/0309-Chandler-PROPFIND-4.result b/testing/tests/regression-suite/0309-Chandler-PROPFIND-4.result
index 0ddce5c4..1b857853 100644
--- a/testing/tests/regression-suite/0309-Chandler-PROPFIND-4.result
+++ b/testing/tests/regression-suite/0309-Chandler-PROPFIND-4.result
@@ -1,6 +1,7 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 ETag: "2e9da41da3450d7ccfe49fb10bb32c62"
 Content-Length: 4287
 Content-Type: text/xml; charset="utf-8"
diff --git a/testing/tests/regression-suite/0310-Chandler-PUT-1.result b/testing/tests/regression-suite/0310-Chandler-PUT-1.result
index 8900b79f..e27c6a9b 100644
--- a/testing/tests/regression-suite/0310-Chandler-PUT-1.result
+++ b/testing/tests/regression-suite/0310-Chandler-PUT-1.result
@@ -1,6 +1,7 @@
 HTTP/1.1 201 Created
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 ETag: "0d7a68984bf525342d22b8924a57e8e2"
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
diff --git a/testing/tests/regression-suite/0311-Chandler-PUT-2.result b/testing/tests/regression-suite/0311-Chandler-PUT-2.result
index 11e40080..edfbdde2 100644
--- a/testing/tests/regression-suite/0311-Chandler-PUT-2.result
+++ b/testing/tests/regression-suite/0311-Chandler-PUT-2.result
@@ -1,6 +1,7 @@
 HTTP/1.1 201 Created
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 ETag: "421abf7e4848d2fecbf64217ed205d4b"
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
diff --git a/testing/tests/regression-suite/0400-Cadaver-OPTIONS-1.result b/testing/tests/regression-suite/0400-Cadaver-OPTIONS-1.result
index e8f7826b..1c685563 100644
--- a/testing/tests/regression-suite/0400-Cadaver-OPTIONS-1.result
+++ b/testing/tests/regression-suite/0400-Cadaver-OPTIONS-1.result
@@ -1,6 +1,7 @@
 HTTP/1.1 200 OK
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 Allow: OPTIONS, PROPFIND, REPORT, DELETE, LOCK, UNLOCK, MOVE, GET, PUT, HEAD, MKTICKET, DELTICKET
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
diff --git a/testing/tests/regression-suite/0501-iCal-PROPFIND.result b/testing/tests/regression-suite/0501-iCal-PROPFIND.result
index 3ceb8517..54c45ee3 100644
--- a/testing/tests/regression-suite/0501-iCal-PROPFIND.result
+++ b/testing/tests/regression-suite/0501-iCal-PROPFIND.result
@@ -1,6 +1,7 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 ETag: "566f3d4049b468c63b21a2c381ab500b"
 Content-Length: 989
 Content-Type: text/xml; charset="utf-8"
diff --git a/testing/tests/regression-suite/0502-iCal-PROPFIND.result b/testing/tests/regression-suite/0502-iCal-PROPFIND.result
index 5d39cf0c..60963c75 100644
--- a/testing/tests/regression-suite/0502-iCal-PROPFIND.result
+++ b/testing/tests/regression-suite/0502-iCal-PROPFIND.result
@@ -1,6 +1,7 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 ETag: "3d57f5e85f8e7d0fe3398eeace49ce1a"
 Content-Length: 3181
 Content-Type: text/xml; charset="utf-8"
diff --git a/testing/tests/regression-suite/0503-iCal-PROPFIND.result b/testing/tests/regression-suite/0503-iCal-PROPFIND.result
index ef7f1cb6..7dc4ed4d 100644
--- a/testing/tests/regression-suite/0503-iCal-PROPFIND.result
+++ b/testing/tests/regression-suite/0503-iCal-PROPFIND.result
@@ -1,6 +1,7 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 ETag: "aa53c32e9f6870f0528351d6f73b283a"
 Content-Length: 675
 Content-Type: text/xml; charset="utf-8"
diff --git a/testing/tests/regression-suite/0504-iCal-PROPFIND.result b/testing/tests/regression-suite/0504-iCal-PROPFIND.result
index ec673f43..5c0e5b58 100644
--- a/testing/tests/regression-suite/0504-iCal-PROPFIND.result
+++ b/testing/tests/regression-suite/0504-iCal-PROPFIND.result
@@ -1,6 +1,7 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 ETag: "51a84c6ced23238efecbe36e6716ba9c"
 Content-Length: 4155
 Content-Type: text/xml; charset="utf-8"
diff --git a/testing/tests/regression-suite/0505-iCal-PUT.result b/testing/tests/regression-suite/0505-iCal-PUT.result
index 516fc185..ee962fbb 100644
--- a/testing/tests/regression-suite/0505-iCal-PUT.result
+++ b/testing/tests/regression-suite/0505-iCal-PUT.result
@@ -1,6 +1,7 @@
 HTTP/1.1 201 Created
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 ETag: "b3e66a461ef178bd4791b2b6509bbb9d"
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
diff --git a/testing/tests/regression-suite/0506-iCal-PUT.result b/testing/tests/regression-suite/0506-iCal-PUT.result
index 37ba1023..2a3fbab3 100644
--- a/testing/tests/regression-suite/0506-iCal-PUT.result
+++ b/testing/tests/regression-suite/0506-iCal-PUT.result
@@ -1,6 +1,7 @@
 HTTP/1.1 204 No Content
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 ETag: "5f050eca5480bbebbe9428222570913d"
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
diff --git a/testing/tests/regression-suite/0507-iCal-MKCALENDAR.result b/testing/tests/regression-suite/0507-iCal-MKCALENDAR.result
index 107f0b5e..44c63f46 100644
--- a/testing/tests/regression-suite/0507-iCal-MKCALENDAR.result
+++ b/testing/tests/regression-suite/0507-iCal-MKCALENDAR.result
@@ -1,6 +1,7 @@
 HTTP/1.1 201 Created
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 Cache-Control: no-cache
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
diff --git a/testing/tests/regression-suite/0508-iCal-REPORT.result b/testing/tests/regression-suite/0508-iCal-REPORT.result
index 2b791c3b..1f1d0e3a 100644
--- a/testing/tests/regression-suite/0508-iCal-REPORT.result
+++ b/testing/tests/regression-suite/0508-iCal-REPORT.result
@@ -1,6 +1,7 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 ETag: "72e80e517b5e1c056e229b6985200b27"
 Content-Length: 1389
 Content-Type: text/xml; charset="utf-8"
diff --git a/testing/tests/regression-suite/0509-iCal-PROPPATCH.result b/testing/tests/regression-suite/0509-iCal-PROPPATCH.result
index d58a8d77..dcd300c6 100644
--- a/testing/tests/regression-suite/0509-iCal-PROPPATCH.result
+++ b/testing/tests/regression-suite/0509-iCal-PROPPATCH.result
@@ -1,6 +1,7 @@
 HTTP/1.1 200 OK
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 Content-Length: 256
 Content-Type: text/xml; charset="utf-8"
 
diff --git a/testing/tests/regression-suite/0510-iCal-PROPFIND.result b/testing/tests/regression-suite/0510-iCal-PROPFIND.result
index 75996cf6..59da9e4f 100644
--- a/testing/tests/regression-suite/0510-iCal-PROPFIND.result
+++ b/testing/tests/regression-suite/0510-iCal-PROPFIND.result
@@ -1,6 +1,7 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 ETag: "acfaf4c13829d0f908c2bd54a2180454"
 Content-Length: 998
 Content-Type: text/xml; charset="utf-8"
diff --git a/testing/tests/regression-suite/0511-iCal-PROPFIND.result b/testing/tests/regression-suite/0511-iCal-PROPFIND.result
index 24624f80..df2c1382 100644
--- a/testing/tests/regression-suite/0511-iCal-PROPFIND.result
+++ b/testing/tests/regression-suite/0511-iCal-PROPFIND.result
@@ -1,6 +1,7 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 ETag: "58ac2b1da600dda0e7b2e256a8dac271"
 Content-Length: 987
 Content-Type: text/xml; charset="utf-8"
diff --git a/testing/tests/regression-suite/0512-iCal-PUT.result b/testing/tests/regression-suite/0512-iCal-PUT.result
index bc188bf5..31b5d303 100644
--- a/testing/tests/regression-suite/0512-iCal-PUT.result
+++ b/testing/tests/regression-suite/0512-iCal-PUT.result
@@ -1,6 +1,7 @@
 HTTP/1.1 201 Created
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 ETag: "b7cfb403232dc83f936c15a179901d50"
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
diff --git a/testing/tests/regression-suite/0513-iCal-PUT.result b/testing/tests/regression-suite/0513-iCal-PUT.result
index fb093b3d..612f9327 100644
--- a/testing/tests/regression-suite/0513-iCal-PUT.result
+++ b/testing/tests/regression-suite/0513-iCal-PUT.result
@@ -1,6 +1,7 @@
 HTTP/1.1 204 No Content
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 ETag: "087d1ea4915719b8a904ca18a9abbbe1"
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
diff --git a/testing/tests/regression-suite/0514-iCal-PUT-VTODO.result b/testing/tests/regression-suite/0514-iCal-PUT-VTODO.result
index 6e024ebf..281584b5 100644
--- a/testing/tests/regression-suite/0514-iCal-PUT-VTODO.result
+++ b/testing/tests/regression-suite/0514-iCal-PUT-VTODO.result
@@ -1,6 +1,7 @@
 HTTP/1.1 201 Created
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 ETag: "18134bbb51c8e25919c92a0d6265f789"
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
diff --git a/testing/tests/regression-suite/0515-iCal-PUT-VEVENT.result b/testing/tests/regression-suite/0515-iCal-PUT-VEVENT.result
index 5ac00691..69ae9525 100644
--- a/testing/tests/regression-suite/0515-iCal-PUT-VEVENT.result
+++ b/testing/tests/regression-suite/0515-iCal-PUT-VEVENT.result
@@ -2,7 +2,8 @@ HTTP/1.1 100 Continue
 
 HTTP/1.1 201 Created
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 ETag: "c057c3eb789b944e76f4d77fccf36ea1"
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
diff --git a/testing/tests/regression-suite/0520-iCal-PROPFIND.result b/testing/tests/regression-suite/0520-iCal-PROPFIND.result
index c8b175b1..2992117f 100644
--- a/testing/tests/regression-suite/0520-iCal-PROPFIND.result
+++ b/testing/tests/regression-suite/0520-iCal-PROPFIND.result
@@ -1,6 +1,7 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 ETag: "c50498a15bb7fd50041aa0de8279f721"
 Content-Length: 1354
 Content-Type: text/xml; charset="utf-8"
diff --git a/testing/tests/regression-suite/0521-iCal-PROPFIND.result b/testing/tests/regression-suite/0521-iCal-PROPFIND.result
index adba2e8c..652d4acd 100644
--- a/testing/tests/regression-suite/0521-iCal-PROPFIND.result
+++ b/testing/tests/regression-suite/0521-iCal-PROPFIND.result
@@ -1,6 +1,7 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 ETag: "ccb220eb6558890eb17d5e1da8b45269"
 Content-Length: 785
 Content-Type: text/xml; charset="utf-8"
diff --git a/testing/tests/regression-suite/0522-iCal-PROPFIND.result b/testing/tests/regression-suite/0522-iCal-PROPFIND.result
index 79dc60fe..e7c63858 100644
--- a/testing/tests/regression-suite/0522-iCal-PROPFIND.result
+++ b/testing/tests/regression-suite/0522-iCal-PROPFIND.result
@@ -1,6 +1,7 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 ETag: "3fc727f4d41e43e47c6a189b1e0258e4"
 Content-Length: 3932
 Content-Type: text/xml; charset="utf-8"
diff --git a/testing/tests/regression-suite/0523-iCal-PROPFIND.result b/testing/tests/regression-suite/0523-iCal-PROPFIND.result
index 2d8b150f..94ca2a0d 100644
--- a/testing/tests/regression-suite/0523-iCal-PROPFIND.result
+++ b/testing/tests/regression-suite/0523-iCal-PROPFIND.result
@@ -1,6 +1,7 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 Content-Location: /caldav.php/user2/
 ETag: "cb2395b4d4b229e5ea994113535bf173"
 Content-Length: 989
diff --git a/testing/tests/regression-suite/0524-iCal-PROPFIND.result b/testing/tests/regression-suite/0524-iCal-PROPFIND.result
index d9c16d47..8f237faa 100644
--- a/testing/tests/regression-suite/0524-iCal-PROPFIND.result
+++ b/testing/tests/regression-suite/0524-iCal-PROPFIND.result
@@ -1,6 +1,7 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 ETag: "3ff13339128a73ed5d25308b678c3bc5"
 Content-Length: 4847
 Content-Type: text/xml; charset="utf-8"
diff --git a/testing/tests/regression-suite/0525-iCal-PROPFIND.result b/testing/tests/regression-suite/0525-iCal-PROPFIND.result
index cd8d3c24..ed58b079 100644
--- a/testing/tests/regression-suite/0525-iCal-PROPFIND.result
+++ b/testing/tests/regression-suite/0525-iCal-PROPFIND.result
@@ -1,6 +1,7 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 ETag: "d5cc88f137d733e311ab4e4f73e88ed8"
 Content-Length: 1357
 Content-Type: text/xml; charset="utf-8"
diff --git a/testing/tests/regression-suite/0526-iCal-PROPFIND.result b/testing/tests/regression-suite/0526-iCal-PROPFIND.result
index ae57dd82..42ffc676 100644
--- a/testing/tests/regression-suite/0526-iCal-PROPFIND.result
+++ b/testing/tests/regression-suite/0526-iCal-PROPFIND.result
@@ -1,6 +1,7 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 ETag: "fc0f5539296edf051d8a53d6a2bfe8cc"
 Content-Length: 764
 Content-Type: text/xml; charset="utf-8"
diff --git a/testing/tests/regression-suite/0527-iCal-PROPFIND.result b/testing/tests/regression-suite/0527-iCal-PROPFIND.result
index 77c28a8d..5cd2f1ae 100644
--- a/testing/tests/regression-suite/0527-iCal-PROPFIND.result
+++ b/testing/tests/regression-suite/0527-iCal-PROPFIND.result
@@ -1,6 +1,7 @@
 HTTP/1.1 403 Forbidden
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 Content-Length: 216
 Content-Type: text/xml; charset="utf-8"
 
diff --git a/testing/tests/regression-suite/0528-iCal-PROPFIND.result b/testing/tests/regression-suite/0528-iCal-PROPFIND.result
index 77c28a8d..5cd2f1ae 100644
--- a/testing/tests/regression-suite/0528-iCal-PROPFIND.result
+++ b/testing/tests/regression-suite/0528-iCal-PROPFIND.result
@@ -1,6 +1,7 @@
 HTTP/1.1 403 Forbidden
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 Content-Length: 216
 Content-Type: text/xml; charset="utf-8"
 
diff --git a/testing/tests/regression-suite/0530-iCal4-PROPFIND.result b/testing/tests/regression-suite/0530-iCal4-PROPFIND.result
index b79c6e5e..e94e6a5e 100644
--- a/testing/tests/regression-suite/0530-iCal4-PROPFIND.result
+++ b/testing/tests/regression-suite/0530-iCal4-PROPFIND.result
@@ -1,6 +1,7 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 ETag: "a69952d4b9b300b227d18e0cc7a2b2d3"
 Content-Length: 303
 Content-Type: text/xml; charset="utf-8"
diff --git a/testing/tests/regression-suite/0531-iCal4-PROPFIND.result b/testing/tests/regression-suite/0531-iCal4-PROPFIND.result
index 234ae506..184a3db9 100644
--- a/testing/tests/regression-suite/0531-iCal4-PROPFIND.result
+++ b/testing/tests/regression-suite/0531-iCal4-PROPFIND.result
@@ -1,6 +1,7 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 ETag: "ae6b3ed31d2295a38ad54bdf12fe02a7"
 Content-Length: 1655
 Content-Type: text/xml; charset="utf-8"
diff --git a/testing/tests/regression-suite/0532-iCal4-PROPFIND.result b/testing/tests/regression-suite/0532-iCal4-PROPFIND.result
index 67f94579..ce4029e2 100644
--- a/testing/tests/regression-suite/0532-iCal4-PROPFIND.result
+++ b/testing/tests/regression-suite/0532-iCal4-PROPFIND.result
@@ -1,8 +1,9 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
-ETag: "8f659cb99eb89d1f6b79f1c075598d54"
-Content-Length: 19068
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+ETag: "0260dc3d76328cb25360f973db33c7cf"
+Content-Length: 15088
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
@@ -41,9 +42,6 @@ Content-Type: text/xml; charset="utf-8"
      <privilege>
       <write-acl/>
      </privilege>
-     <privilege>
-      <C1:read-free-busy/>
-     </privilege>
      <privilege>
       <write/>
      </privilege>
@@ -59,30 +57,6 @@ Content-Type: text/xml; charset="utf-8"
      <privilege>
       <unbind/>
      </privilege>
-     <privilege>
-      <C1:schedule-deliver/>
-     </privilege>
-     <privilege>
-      <C1:schedule-deliver-invite/>
-     </privilege>
-     <privilege>
-      <C1:schedule-deliver-reply/>
-     </privilege>
-     <privilege>
-      <C1:schedule-query-freebusy/>
-     </privilege>
-     <privilege>
-      <C1:schedule-send/>
-     </privilege>
-     <privilege>
-      <C1:schedule-send-invite/>
-     </privilege>
-     <privilege>
-      <C1:schedule-send-reply/>
-     </privilege>
-     <privilege>
-      <C1:schedule-send-freebusy/>
-     </privilege>
     </current-user-privilege-set>
    </prop>
    <status>HTTP/1.1 200 OK</status>
@@ -163,30 +137,6 @@ Content-Type: text/xml; charset="utf-8"
      <privilege>
       <unbind/>
      </privilege>
-     <privilege>
-      <C1:schedule-deliver/>
-     </privilege>
-     <privilege>
-      <C1:schedule-deliver-invite/>
-     </privilege>
-     <privilege>
-      <C1:schedule-deliver-reply/>
-     </privilege>
-     <privilege>
-      <C1:schedule-query-freebusy/>
-     </privilege>
-     <privilege>
-      <C1:schedule-send/>
-     </privilege>
-     <privilege>
-      <C1:schedule-send-invite/>
-     </privilege>
-     <privilege>
-      <C1:schedule-send-reply/>
-     </privilege>
-     <privilege>
-      <C1:schedule-send-freebusy/>
-     </privilege>
     </current-user-privilege-set>
    </prop>
    <status>HTTP/1.1 200 OK</status>
@@ -266,30 +216,6 @@ Content-Type: text/xml; charset="utf-8"
      <privilege>
       <unbind/>
      </privilege>
-     <privilege>
-      <C1:schedule-deliver/>
-     </privilege>
-     <privilege>
-      <C1:schedule-deliver-invite/>
-     </privilege>
-     <privilege>
-      <C1:schedule-deliver-reply/>
-     </privilege>
-     <privilege>
-      <C1:schedule-query-freebusy/>
-     </privilege>
-     <privilege>
-      <C1:schedule-send/>
-     </privilege>
-     <privilege>
-      <C1:schedule-send-invite/>
-     </privilege>
-     <privilege>
-      <C1:schedule-send-reply/>
-     </privilege>
-     <privilege>
-      <C1:schedule-send-freebusy/>
-     </privilege>
     </current-user-privilege-set>
    </prop>
    <status>HTTP/1.1 200 OK</status>
@@ -349,9 +275,6 @@ Content-Type: text/xml; charset="utf-8"
      <privilege>
       <write-acl/>
      </privilege>
-     <privilege>
-      <C1:read-free-busy/>
-     </privilege>
      <privilege>
       <write/>
      </privilege>
@@ -379,18 +302,6 @@ Content-Type: text/xml; charset="utf-8"
      <privilege>
       <C1:schedule-query-freebusy/>
      </privilege>
-     <privilege>
-      <C1:schedule-send/>
-     </privilege>
-     <privilege>
-      <C1:schedule-send-invite/>
-     </privilege>
-     <privilege>
-      <C1:schedule-send-reply/>
-     </privilege>
-     <privilege>
-      <C1:schedule-send-freebusy/>
-     </privilege>
     </current-user-privilege-set>
    </prop>
    <status>HTTP/1.1 200 OK</status>
@@ -450,9 +361,6 @@ Content-Type: text/xml; charset="utf-8"
      <privilege>
       <write-acl/>
      </privilege>
-     <privilege>
-      <C1:read-free-busy/>
-     </privilege>
      <privilege>
       <write/>
      </privilege>
@@ -468,18 +376,6 @@ Content-Type: text/xml; charset="utf-8"
      <privilege>
       <unbind/>
      </privilege>
-     <privilege>
-      <C1:schedule-deliver/>
-     </privilege>
-     <privilege>
-      <C1:schedule-deliver-invite/>
-     </privilege>
-     <privilege>
-      <C1:schedule-deliver-reply/>
-     </privilege>
-     <privilege>
-      <C1:schedule-query-freebusy/>
-     </privilege>
      <privilege>
       <C1:schedule-send/>
      </privilege>
@@ -572,30 +468,6 @@ Content-Type: text/xml; charset="utf-8"
      <privilege>
       <unbind/>
      </privilege>
-     <privilege>
-      <C1:schedule-deliver/>
-     </privilege>
-     <privilege>
-      <C1:schedule-deliver-invite/>
-     </privilege>
-     <privilege>
-      <C1:schedule-deliver-reply/>
-     </privilege>
-     <privilege>
-      <C1:schedule-query-freebusy/>
-     </privilege>
-     <privilege>
-      <C1:schedule-send/>
-     </privilege>
-     <privilege>
-      <C1:schedule-send-invite/>
-     </privilege>
-     <privilege>
-      <C1:schedule-send-reply/>
-     </privilege>
-     <privilege>
-      <C1:schedule-send-freebusy/>
-     </privilege>
     </current-user-privilege-set>
    </prop>
    <status>HTTP/1.1 200 OK</status>
@@ -667,30 +539,6 @@ Content-Type: text/xml; charset="utf-8"
      <privilege>
       <unbind/>
      </privilege>
-     <privilege>
-      <C1:schedule-deliver/>
-     </privilege>
-     <privilege>
-      <C1:schedule-deliver-invite/>
-     </privilege>
-     <privilege>
-      <C1:schedule-deliver-reply/>
-     </privilege>
-     <privilege>
-      <C1:schedule-query-freebusy/>
-     </privilege>
-     <privilege>
-      <C1:schedule-send/>
-     </privilege>
-     <privilege>
-      <C1:schedule-send-invite/>
-     </privilege>
-     <privilege>
-      <C1:schedule-send-reply/>
-     </privilege>
-     <privilege>
-      <C1:schedule-send-freebusy/>
-     </privilege>
     </current-user-privilege-set>
    </prop>
    <status>HTTP/1.1 200 OK</status>
@@ -764,30 +612,6 @@ Content-Type: text/xml; charset="utf-8"
      <privilege>
       <unbind/>
      </privilege>
-     <privilege>
-      <C1:schedule-deliver/>
-     </privilege>
-     <privilege>
-      <C1:schedule-deliver-invite/>
-     </privilege>
-     <privilege>
-      <C1:schedule-deliver-reply/>
-     </privilege>
-     <privilege>
-      <C1:schedule-query-freebusy/>
-     </privilege>
-     <privilege>
-      <C1:schedule-send/>
-     </privilege>
-     <privilege>
-      <C1:schedule-send-invite/>
-     </privilege>
-     <privilege>
-      <C1:schedule-send-reply/>
-     </privilege>
-     <privilege>
-      <C1:schedule-send-freebusy/>
-     </privilege>
     </current-user-privilege-set>
    </prop>
    <status>HTTP/1.1 200 OK</status>
diff --git a/testing/tests/regression-suite/0533-iCal4-PROPPATCH.result b/testing/tests/regression-suite/0533-iCal4-PROPPATCH.result
index 0cad1842..c5d4c536 100644
--- a/testing/tests/regression-suite/0533-iCal4-PROPPATCH.result
+++ b/testing/tests/regression-suite/0533-iCal4-PROPPATCH.result
@@ -1,6 +1,7 @@
 HTTP/1.1 200 OK
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 Content-Length: 224
 Content-Type: text/xml; charset="utf-8"
 
diff --git a/testing/tests/regression-suite/0534-iCal4-PROPPATCH.result b/testing/tests/regression-suite/0534-iCal4-PROPPATCH.result
index 0cad1842..c5d4c536 100644
--- a/testing/tests/regression-suite/0534-iCal4-PROPPATCH.result
+++ b/testing/tests/regression-suite/0534-iCal4-PROPPATCH.result
@@ -1,6 +1,7 @@
 HTTP/1.1 200 OK
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 Content-Length: 224
 Content-Type: text/xml; charset="utf-8"
 
diff --git a/testing/tests/regression-suite/0535-iCal4-PROPPATCH.result b/testing/tests/regression-suite/0535-iCal4-PROPPATCH.result
index 0cad1842..c5d4c536 100644
--- a/testing/tests/regression-suite/0535-iCal4-PROPPATCH.result
+++ b/testing/tests/regression-suite/0535-iCal4-PROPPATCH.result
@@ -1,6 +1,7 @@
 HTTP/1.1 200 OK
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 Content-Length: 224
 Content-Type: text/xml; charset="utf-8"
 
diff --git a/testing/tests/regression-suite/0536-iCal4-PROPFIND.result b/testing/tests/regression-suite/0536-iCal4-PROPFIND.result
index c0fd4c79..7a52d1d9 100644
--- a/testing/tests/regression-suite/0536-iCal4-PROPFIND.result
+++ b/testing/tests/regression-suite/0536-iCal4-PROPFIND.result
@@ -1,6 +1,7 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 ETag: "78317cedf5ac64209ccd8079a3194e8f"
 Content-Length: 4421
 Content-Type: text/xml; charset="utf-8"
diff --git a/testing/tests/regression-suite/0537-iCal4-PROPFIND.result b/testing/tests/regression-suite/0537-iCal4-PROPFIND.result
index 0041a28f..5da8a395 100644
--- a/testing/tests/regression-suite/0537-iCal4-PROPFIND.result
+++ b/testing/tests/regression-suite/0537-iCal4-PROPFIND.result
@@ -1,6 +1,7 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 ETag: "60530d57c79ae87c8c63c20c78707c1c"
 Content-Length: 767
 Content-Type: text/xml; charset="utf-8"
diff --git a/testing/tests/regression-suite/0538-iCal4-PUT.result b/testing/tests/regression-suite/0538-iCal4-PUT.result
index c1b9a08c..ba8223b5 100644
--- a/testing/tests/regression-suite/0538-iCal4-PUT.result
+++ b/testing/tests/regression-suite/0538-iCal4-PUT.result
@@ -1,6 +1,7 @@
 HTTP/1.1 201 Created
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 ETag: "257b9df4aaf573a578af4aadd033abf4"
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
diff --git a/testing/tests/regression-suite/0539-iCal4-PROPFIND.result b/testing/tests/regression-suite/0539-iCal4-PROPFIND.result
index d675db65..621437ab 100644
--- a/testing/tests/regression-suite/0539-iCal4-PROPFIND.result
+++ b/testing/tests/regression-suite/0539-iCal4-PROPFIND.result
@@ -1,6 +1,7 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 ETag: "dfef5d203b227bafbee76592e8924179"
 Content-Length: 291
 Content-Type: text/xml; charset="utf-8"
diff --git a/testing/tests/regression-suite/0540-iCal4-PROPFIND.result b/testing/tests/regression-suite/0540-iCal4-PROPFIND.result
index 5c52facc..dbcdb554 100644
--- a/testing/tests/regression-suite/0540-iCal4-PROPFIND.result
+++ b/testing/tests/regression-suite/0540-iCal4-PROPFIND.result
@@ -1,6 +1,7 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 ETag: "e08b84121b3f5a9294092cd23f6e5798"
 Content-Length: 304
 Content-Type: text/xml; charset="utf-8"
diff --git a/testing/tests/regression-suite/0541-iCal4-PROPFIND.result b/testing/tests/regression-suite/0541-iCal4-PROPFIND.result
index 8a2d30d0..e1bf0d45 100644
--- a/testing/tests/regression-suite/0541-iCal4-PROPFIND.result
+++ b/testing/tests/regression-suite/0541-iCal4-PROPFIND.result
@@ -1,6 +1,7 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 ETag: "19e51f9bc18826db107f6b07900cea8a"
 Content-Length: 1388
 Content-Type: text/xml; charset="utf-8"
diff --git a/testing/tests/regression-suite/0542-iCal4-REPORT.result b/testing/tests/regression-suite/0542-iCal4-REPORT.result
index 5b891211..205bb83b 100644
--- a/testing/tests/regression-suite/0542-iCal4-REPORT.result
+++ b/testing/tests/regression-suite/0542-iCal4-REPORT.result
@@ -1,6 +1,7 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 ETag: "dc8a8dd8d55f610adb87fb0f9c1705cf"
 Content-Length: 2405
 Content-Type: text/xml; charset="utf-8"
diff --git a/testing/tests/regression-suite/0550-iPhone-REPORT.result b/testing/tests/regression-suite/0550-iPhone-REPORT.result
index 5d283097..72b0bd5d 100644
--- a/testing/tests/regression-suite/0550-iPhone-REPORT.result
+++ b/testing/tests/regression-suite/0550-iPhone-REPORT.result
@@ -1,6 +1,7 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 ETag: "160cbfd2f93fae8c193c87b0fa8b8c6a"
 Content-Length: 1146
 Content-Type: text/xml; charset="utf-8"
diff --git a/testing/tests/regression-suite/0551-iPhone-REPORT.result b/testing/tests/regression-suite/0551-iPhone-REPORT.result
index 872abde3..e508d7da 100644
--- a/testing/tests/regression-suite/0551-iPhone-REPORT.result
+++ b/testing/tests/regression-suite/0551-iPhone-REPORT.result
@@ -1,6 +1,7 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 ETag: "2e7702d874d6a53c957bf59a6220d2c9"
 Content-Length: 4411
 Content-Type: text/xml; charset="utf-8"
diff --git a/testing/tests/regression-suite/0552-iPhone-PROPFIND.result b/testing/tests/regression-suite/0552-iPhone-PROPFIND.result
index a154f49d..19a1495b 100644
--- a/testing/tests/regression-suite/0552-iPhone-PROPFIND.result
+++ b/testing/tests/regression-suite/0552-iPhone-PROPFIND.result
@@ -1,6 +1,7 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 ETag: "9c0097968135b1bb539cee7121158c9c"
 Content-Length: 995
 Content-Type: text/xml; charset="utf-8"
diff --git a/testing/tests/regression-suite/0553-iPhone-PROPFIND.result b/testing/tests/regression-suite/0553-iPhone-PROPFIND.result
index 2a1d503b..88a0cd9b 100644
--- a/testing/tests/regression-suite/0553-iPhone-PROPFIND.result
+++ b/testing/tests/regression-suite/0553-iPhone-PROPFIND.result
@@ -1,8 +1,9 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
-ETag: "e5a193a9e457e0e293583cd99727b4e6"
-Content-Length: 15434
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+ETag: "c8fe421dcc368c5ba9ebf73ba661a2e5"
+Content-Length: 11513
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
@@ -36,9 +37,6 @@ Content-Type: text/xml; charset="utf-8"
      <privilege>
       <write-acl/>
      </privilege>
-     <privilege>
-      <C:read-free-busy/>
-     </privilege>
      <privilege>
       <write/>
      </privilege>
@@ -54,30 +52,6 @@ Content-Type: text/xml; charset="utf-8"
      <privilege>
       <unbind/>
      </privilege>
-     <privilege>
-      <C:schedule-deliver/>
-     </privilege>
-     <privilege>
-      <C:schedule-deliver-invite/>
-     </privilege>
-     <privilege>
-      <C:schedule-deliver-reply/>
-     </privilege>
-     <privilege>
-      <C:schedule-query-freebusy/>
-     </privilege>
-     <privilege>
-      <C:schedule-send/>
-     </privilege>
-     <privilege>
-      <C:schedule-send-invite/>
-     </privilege>
-     <privilege>
-      <C:schedule-send-reply/>
-     </privilege>
-     <privilege>
-      <C:schedule-send-freebusy/>
-     </privilege>
     </current-user-privilege-set>
    </prop>
    <status>HTTP/1.1 200 OK</status>
@@ -146,30 +120,6 @@ Content-Type: text/xml; charset="utf-8"
      <privilege>
       <unbind/>
      </privilege>
-     <privilege>
-      <C:schedule-deliver/>
-     </privilege>
-     <privilege>
-      <C:schedule-deliver-invite/>
-     </privilege>
-     <privilege>
-      <C:schedule-deliver-reply/>
-     </privilege>
-     <privilege>
-      <C:schedule-query-freebusy/>
-     </privilege>
-     <privilege>
-      <C:schedule-send/>
-     </privilege>
-     <privilege>
-      <C:schedule-send-invite/>
-     </privilege>
-     <privilege>
-      <C:schedule-send-reply/>
-     </privilege>
-     <privilege>
-      <C:schedule-send-freebusy/>
-     </privilege>
     </current-user-privilege-set>
    </prop>
    <status>HTTP/1.1 200 OK</status>
@@ -235,30 +185,6 @@ Content-Type: text/xml; charset="utf-8"
      <privilege>
       <unbind/>
      </privilege>
-     <privilege>
-      <C:schedule-deliver/>
-     </privilege>
-     <privilege>
-      <C:schedule-deliver-invite/>
-     </privilege>
-     <privilege>
-      <C:schedule-deliver-reply/>
-     </privilege>
-     <privilege>
-      <C:schedule-query-freebusy/>
-     </privilege>
-     <privilege>
-      <C:schedule-send/>
-     </privilege>
-     <privilege>
-      <C:schedule-send-invite/>
-     </privilege>
-     <privilege>
-      <C:schedule-send-reply/>
-     </privilege>
-     <privilege>
-      <C:schedule-send-freebusy/>
-     </privilege>
     </current-user-privilege-set>
    </prop>
    <status>HTTP/1.1 200 OK</status>
@@ -305,9 +231,6 @@ Content-Type: text/xml; charset="utf-8"
      <privilege>
       <write-acl/>
      </privilege>
-     <privilege>
-      <C:read-free-busy/>
-     </privilege>
      <privilege>
       <write/>
      </privilege>
@@ -335,18 +258,6 @@ Content-Type: text/xml; charset="utf-8"
      <privilege>
       <C:schedule-query-freebusy/>
      </privilege>
-     <privilege>
-      <C:schedule-send/>
-     </privilege>
-     <privilege>
-      <C:schedule-send-invite/>
-     </privilege>
-     <privilege>
-      <C:schedule-send-reply/>
-     </privilege>
-     <privilege>
-      <C:schedule-send-freebusy/>
-     </privilege>
     </current-user-privilege-set>
    </prop>
    <status>HTTP/1.1 200 OK</status>
@@ -393,9 +304,6 @@ Content-Type: text/xml; charset="utf-8"
      <privilege>
       <write-acl/>
      </privilege>
-     <privilege>
-      <C:read-free-busy/>
-     </privilege>
      <privilege>
       <write/>
      </privilege>
@@ -411,18 +319,6 @@ Content-Type: text/xml; charset="utf-8"
      <privilege>
       <unbind/>
      </privilege>
-     <privilege>
-      <C:schedule-deliver/>
-     </privilege>
-     <privilege>
-      <C:schedule-deliver-invite/>
-     </privilege>
-     <privilege>
-      <C:schedule-deliver-reply/>
-     </privilege>
-     <privilege>
-      <C:schedule-query-freebusy/>
-     </privilege>
      <privilege>
       <C:schedule-send/>
      </privilege>
@@ -502,30 +398,6 @@ Content-Type: text/xml; charset="utf-8"
      <privilege>
       <unbind/>
      </privilege>
-     <privilege>
-      <C:schedule-deliver/>
-     </privilege>
-     <privilege>
-      <C:schedule-deliver-invite/>
-     </privilege>
-     <privilege>
-      <C:schedule-deliver-reply/>
-     </privilege>
-     <privilege>
-      <C:schedule-query-freebusy/>
-     </privilege>
-     <privilege>
-      <C:schedule-send/>
-     </privilege>
-     <privilege>
-      <C:schedule-send-invite/>
-     </privilege>
-     <privilege>
-      <C:schedule-send-reply/>
-     </privilege>
-     <privilege>
-      <C:schedule-send-freebusy/>
-     </privilege>
     </current-user-privilege-set>
    </prop>
    <status>HTTP/1.1 200 OK</status>
@@ -584,30 +456,6 @@ Content-Type: text/xml; charset="utf-8"
      <privilege>
       <unbind/>
      </privilege>
-     <privilege>
-      <C:schedule-deliver/>
-     </privilege>
-     <privilege>
-      <C:schedule-deliver-invite/>
-     </privilege>
-     <privilege>
-      <C:schedule-deliver-reply/>
-     </privilege>
-     <privilege>
-      <C:schedule-query-freebusy/>
-     </privilege>
-     <privilege>
-      <C:schedule-send/>
-     </privilege>
-     <privilege>
-      <C:schedule-send-invite/>
-     </privilege>
-     <privilege>
-      <C:schedule-send-reply/>
-     </privilege>
-     <privilege>
-      <C:schedule-send-freebusy/>
-     </privilege>
     </current-user-privilege-set>
    </prop>
    <status>HTTP/1.1 200 OK</status>
@@ -668,30 +516,6 @@ Content-Type: text/xml; charset="utf-8"
      <privilege>
       <unbind/>
      </privilege>
-     <privilege>
-      <C:schedule-deliver/>
-     </privilege>
-     <privilege>
-      <C:schedule-deliver-invite/>
-     </privilege>
-     <privilege>
-      <C:schedule-deliver-reply/>
-     </privilege>
-     <privilege>
-      <C:schedule-query-freebusy/>
-     </privilege>
-     <privilege>
-      <C:schedule-send/>
-     </privilege>
-     <privilege>
-      <C:schedule-send-invite/>
-     </privilege>
-     <privilege>
-      <C:schedule-send-reply/>
-     </privilege>
-     <privilege>
-      <C:schedule-send-freebusy/>
-     </privilege>
     </current-user-privilege-set>
    </prop>
    <status>HTTP/1.1 200 OK</status>
diff --git a/testing/tests/regression-suite/0554-iPhone-PROPFIND.result b/testing/tests/regression-suite/0554-iPhone-PROPFIND.result
index 2a1d503b..88a0cd9b 100644
--- a/testing/tests/regression-suite/0554-iPhone-PROPFIND.result
+++ b/testing/tests/regression-suite/0554-iPhone-PROPFIND.result
@@ -1,8 +1,9 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
-ETag: "e5a193a9e457e0e293583cd99727b4e6"
-Content-Length: 15434
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+ETag: "c8fe421dcc368c5ba9ebf73ba661a2e5"
+Content-Length: 11513
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
@@ -36,9 +37,6 @@ Content-Type: text/xml; charset="utf-8"
      <privilege>
       <write-acl/>
      </privilege>
-     <privilege>
-      <C:read-free-busy/>
-     </privilege>
      <privilege>
       <write/>
      </privilege>
@@ -54,30 +52,6 @@ Content-Type: text/xml; charset="utf-8"
      <privilege>
       <unbind/>
      </privilege>
-     <privilege>
-      <C:schedule-deliver/>
-     </privilege>
-     <privilege>
-      <C:schedule-deliver-invite/>
-     </privilege>
-     <privilege>
-      <C:schedule-deliver-reply/>
-     </privilege>
-     <privilege>
-      <C:schedule-query-freebusy/>
-     </privilege>
-     <privilege>
-      <C:schedule-send/>
-     </privilege>
-     <privilege>
-      <C:schedule-send-invite/>
-     </privilege>
-     <privilege>
-      <C:schedule-send-reply/>
-     </privilege>
-     <privilege>
-      <C:schedule-send-freebusy/>
-     </privilege>
     </current-user-privilege-set>
    </prop>
    <status>HTTP/1.1 200 OK</status>
@@ -146,30 +120,6 @@ Content-Type: text/xml; charset="utf-8"
      <privilege>
       <unbind/>
      </privilege>
-     <privilege>
-      <C:schedule-deliver/>
-     </privilege>
-     <privilege>
-      <C:schedule-deliver-invite/>
-     </privilege>
-     <privilege>
-      <C:schedule-deliver-reply/>
-     </privilege>
-     <privilege>
-      <C:schedule-query-freebusy/>
-     </privilege>
-     <privilege>
-      <C:schedule-send/>
-     </privilege>
-     <privilege>
-      <C:schedule-send-invite/>
-     </privilege>
-     <privilege>
-      <C:schedule-send-reply/>
-     </privilege>
-     <privilege>
-      <C:schedule-send-freebusy/>
-     </privilege>
     </current-user-privilege-set>
    </prop>
    <status>HTTP/1.1 200 OK</status>
@@ -235,30 +185,6 @@ Content-Type: text/xml; charset="utf-8"
      <privilege>
       <unbind/>
      </privilege>
-     <privilege>
-      <C:schedule-deliver/>
-     </privilege>
-     <privilege>
-      <C:schedule-deliver-invite/>
-     </privilege>
-     <privilege>
-      <C:schedule-deliver-reply/>
-     </privilege>
-     <privilege>
-      <C:schedule-query-freebusy/>
-     </privilege>
-     <privilege>
-      <C:schedule-send/>
-     </privilege>
-     <privilege>
-      <C:schedule-send-invite/>
-     </privilege>
-     <privilege>
-      <C:schedule-send-reply/>
-     </privilege>
-     <privilege>
-      <C:schedule-send-freebusy/>
-     </privilege>
     </current-user-privilege-set>
    </prop>
    <status>HTTP/1.1 200 OK</status>
@@ -305,9 +231,6 @@ Content-Type: text/xml; charset="utf-8"
      <privilege>
       <write-acl/>
      </privilege>
-     <privilege>
-      <C:read-free-busy/>
-     </privilege>
      <privilege>
       <write/>
      </privilege>
@@ -335,18 +258,6 @@ Content-Type: text/xml; charset="utf-8"
      <privilege>
       <C:schedule-query-freebusy/>
      </privilege>
-     <privilege>
-      <C:schedule-send/>
-     </privilege>
-     <privilege>
-      <C:schedule-send-invite/>
-     </privilege>
-     <privilege>
-      <C:schedule-send-reply/>
-     </privilege>
-     <privilege>
-      <C:schedule-send-freebusy/>
-     </privilege>
     </current-user-privilege-set>
    </prop>
    <status>HTTP/1.1 200 OK</status>
@@ -393,9 +304,6 @@ Content-Type: text/xml; charset="utf-8"
      <privilege>
       <write-acl/>
      </privilege>
-     <privilege>
-      <C:read-free-busy/>
-     </privilege>
      <privilege>
       <write/>
      </privilege>
@@ -411,18 +319,6 @@ Content-Type: text/xml; charset="utf-8"
      <privilege>
       <unbind/>
      </privilege>
-     <privilege>
-      <C:schedule-deliver/>
-     </privilege>
-     <privilege>
-      <C:schedule-deliver-invite/>
-     </privilege>
-     <privilege>
-      <C:schedule-deliver-reply/>
-     </privilege>
-     <privilege>
-      <C:schedule-query-freebusy/>
-     </privilege>
      <privilege>
       <C:schedule-send/>
      </privilege>
@@ -502,30 +398,6 @@ Content-Type: text/xml; charset="utf-8"
      <privilege>
       <unbind/>
      </privilege>
-     <privilege>
-      <C:schedule-deliver/>
-     </privilege>
-     <privilege>
-      <C:schedule-deliver-invite/>
-     </privilege>
-     <privilege>
-      <C:schedule-deliver-reply/>
-     </privilege>
-     <privilege>
-      <C:schedule-query-freebusy/>
-     </privilege>
-     <privilege>
-      <C:schedule-send/>
-     </privilege>
-     <privilege>
-      <C:schedule-send-invite/>
-     </privilege>
-     <privilege>
-      <C:schedule-send-reply/>
-     </privilege>
-     <privilege>
-      <C:schedule-send-freebusy/>
-     </privilege>
     </current-user-privilege-set>
    </prop>
    <status>HTTP/1.1 200 OK</status>
@@ -584,30 +456,6 @@ Content-Type: text/xml; charset="utf-8"
      <privilege>
       <unbind/>
      </privilege>
-     <privilege>
-      <C:schedule-deliver/>
-     </privilege>
-     <privilege>
-      <C:schedule-deliver-invite/>
-     </privilege>
-     <privilege>
-      <C:schedule-deliver-reply/>
-     </privilege>
-     <privilege>
-      <C:schedule-query-freebusy/>
-     </privilege>
-     <privilege>
-      <C:schedule-send/>
-     </privilege>
-     <privilege>
-      <C:schedule-send-invite/>
-     </privilege>
-     <privilege>
-      <C:schedule-send-reply/>
-     </privilege>
-     <privilege>
-      <C:schedule-send-freebusy/>
-     </privilege>
     </current-user-privilege-set>
    </prop>
    <status>HTTP/1.1 200 OK</status>
@@ -668,30 +516,6 @@ Content-Type: text/xml; charset="utf-8"
      <privilege>
       <unbind/>
      </privilege>
-     <privilege>
-      <C:schedule-deliver/>
-     </privilege>
-     <privilege>
-      <C:schedule-deliver-invite/>
-     </privilege>
-     <privilege>
-      <C:schedule-deliver-reply/>
-     </privilege>
-     <privilege>
-      <C:schedule-query-freebusy/>
-     </privilege>
-     <privilege>
-      <C:schedule-send/>
-     </privilege>
-     <privilege>
-      <C:schedule-send-invite/>
-     </privilege>
-     <privilege>
-      <C:schedule-send-reply/>
-     </privilege>
-     <privilege>
-      <C:schedule-send-freebusy/>
-     </privilege>
     </current-user-privilege-set>
    </prop>
    <status>HTTP/1.1 200 OK</status>
diff --git a/testing/tests/regression-suite/0555-iPhone-REPORT.result b/testing/tests/regression-suite/0555-iPhone-REPORT.result
index 06e6a308..ef972775 100644
--- a/testing/tests/regression-suite/0555-iPhone-REPORT.result
+++ b/testing/tests/regression-suite/0555-iPhone-REPORT.result
@@ -1,6 +1,7 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 ETag: "2389a13c9217f7969b16f81ba7ef6985"
 Content-Length: 880
 Content-Type: text/xml; charset="utf-8"
diff --git a/testing/tests/regression-suite/0598-REPORT-sync-initial.result b/testing/tests/regression-suite/0598-REPORT-sync-initial.result
index 361c3518..678b1e27 100644
--- a/testing/tests/regression-suite/0598-REPORT-sync-initial.result
+++ b/testing/tests/regression-suite/0598-REPORT-sync-initial.result
@@ -1,6 +1,7 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 ETag: "54f965132f0412ce06e6841180923c1a"
 Content-Length: 4824
 Content-Type: text/xml; charset="utf-8"
diff --git a/testing/tests/regression-suite/0599-REPORT-sync-changed.result b/testing/tests/regression-suite/0599-REPORT-sync-changed.result
index 162643b5..24a912a5 100644
--- a/testing/tests/regression-suite/0599-REPORT-sync-changed.result
+++ b/testing/tests/regression-suite/0599-REPORT-sync-changed.result
@@ -1,6 +1,7 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 ETag: "a3009bc4863f7b991b1fa62e8e2816e4"
 Content-Length: 4530
 Content-Type: text/xml; charset="utf-8"
diff --git a/testing/tests/regression-suite/0601-Soho-OPTIONS.result b/testing/tests/regression-suite/0601-Soho-OPTIONS.result
index c7c1c6e0..ba7b4316 100644
--- a/testing/tests/regression-suite/0601-Soho-OPTIONS.result
+++ b/testing/tests/regression-suite/0601-Soho-OPTIONS.result
@@ -1,6 +1,7 @@
 HTTP/1.1 200 OK
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 Allow: OPTIONS, PROPFIND, REPORT, DELETE, LOCK, UNLOCK, MOVE, GET, PUT, HEAD, MKCOL, MKCALENDAR, PROPPATCH
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
diff --git a/testing/tests/regression-suite/0602-Soho-PROPFIND.result b/testing/tests/regression-suite/0602-Soho-PROPFIND.result
index 97aec02e..8b6ec173 100644
--- a/testing/tests/regression-suite/0602-Soho-PROPFIND.result
+++ b/testing/tests/regression-suite/0602-Soho-PROPFIND.result
@@ -1,6 +1,7 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 ETag: "44487da270d6e0c4f71f784688a0896d"
 Content-Length: 15362
 Content-Type: text/xml; charset="utf-8"
diff --git a/testing/tests/regression-suite/0603-Soho-PROPFIND.result b/testing/tests/regression-suite/0603-Soho-PROPFIND.result
index 1f00a828..e4855a55 100644
--- a/testing/tests/regression-suite/0603-Soho-PROPFIND.result
+++ b/testing/tests/regression-suite/0603-Soho-PROPFIND.result
@@ -1,6 +1,7 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 ETag: "ea92b512c27205b703cb6f52043bb6d3"
 Content-Length: 4476
 Content-Type: text/xml; charset="utf-8"
diff --git a/testing/tests/regression-suite/0604-Soho-PROPFIND.result b/testing/tests/regression-suite/0604-Soho-PROPFIND.result
index 73036b74..f3d42ef8 100644
--- a/testing/tests/regression-suite/0604-Soho-PROPFIND.result
+++ b/testing/tests/regression-suite/0604-Soho-PROPFIND.result
@@ -1,6 +1,7 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 ETag: "600c4b10a558bf4dcaff71d767733dbc"
 Content-Length: 694
 Content-Type: text/xml; charset="utf-8"
diff --git a/testing/tests/regression-suite/0605-Soho-MKCALENDAR.result b/testing/tests/regression-suite/0605-Soho-MKCALENDAR.result
index cf62fdac..c73ed1ca 100644
--- a/testing/tests/regression-suite/0605-Soho-MKCALENDAR.result
+++ b/testing/tests/regression-suite/0605-Soho-MKCALENDAR.result
@@ -1,6 +1,7 @@
 HTTP/1.1 201 Created
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 Cache-Control: no-cache
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
diff --git a/testing/tests/regression-suite/0606-Soho-PROPPATCH.result b/testing/tests/regression-suite/0606-Soho-PROPPATCH.result
index f0351d0e..66c68cba 100644
--- a/testing/tests/regression-suite/0606-Soho-PROPPATCH.result
+++ b/testing/tests/regression-suite/0606-Soho-PROPPATCH.result
@@ -1,6 +1,7 @@
 HTTP/1.1 200 OK
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 Content-Location: /caldav.php/user1/SOHO%20collection/
 Content-Length: 237
 Content-Type: text/xml; charset="utf-8"
diff --git a/testing/tests/regression-suite/0700-caldav4j-MKCALENDAR.result b/testing/tests/regression-suite/0700-caldav4j-MKCALENDAR.result
index bd17e937..b5e461e9 100644
--- a/testing/tests/regression-suite/0700-caldav4j-MKCALENDAR.result
+++ b/testing/tests/regression-suite/0700-caldav4j-MKCALENDAR.result
@@ -1,6 +1,7 @@
 HTTP/1.1 201 Created
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 Cache-Control: no-cache
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
diff --git a/testing/tests/regression-suite/0701-caldav4j-PUT.result b/testing/tests/regression-suite/0701-caldav4j-PUT.result
index 7f8e8772..10b65896 100644
--- a/testing/tests/regression-suite/0701-caldav4j-PUT.result
+++ b/testing/tests/regression-suite/0701-caldav4j-PUT.result
@@ -1,6 +1,7 @@
 HTTP/1.1 201 Created
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 ETag: "7b70c8c0621b4daac509b8198e9e13d8"
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
diff --git a/testing/tests/regression-suite/0702-caldav4j-PUT.result b/testing/tests/regression-suite/0702-caldav4j-PUT.result
index 1f324426..14056cfd 100644
--- a/testing/tests/regression-suite/0702-caldav4j-PUT.result
+++ b/testing/tests/regression-suite/0702-caldav4j-PUT.result
@@ -1,6 +1,7 @@
 HTTP/1.1 201 Created
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 ETag: "c056350d3c91ac45724c0f9773778941"
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
diff --git a/testing/tests/regression-suite/0800-Spec-LOCK-1.result b/testing/tests/regression-suite/0800-Spec-LOCK-1.result
index 8c9b5b55..f199e12e 100644
--- a/testing/tests/regression-suite/0800-Spec-LOCK-1.result
+++ b/testing/tests/regression-suite/0800-Spec-LOCK-1.result
@@ -1,6 +1,7 @@
 HTTP/1.1 200 OK
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 Lock-Token: <opaquelocktoken:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx>
 Content-Length: 460
 Content-Type: text/xml; charset="utf-8"
diff --git a/testing/tests/regression-suite/0801-Spec-LOCK-1.result b/testing/tests/regression-suite/0801-Spec-LOCK-1.result
index 2ba20d6a..14e5c67f 100644
--- a/testing/tests/regression-suite/0801-Spec-LOCK-1.result
+++ b/testing/tests/regression-suite/0801-Spec-LOCK-1.result
@@ -1,6 +1,7 @@
 HTTP/1.1 200 OK
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 Content-Length: 460
 Content-Type: text/xml; charset="utf-8"
 
diff --git a/testing/tests/regression-suite/0802-Spec-LOCK-1.result b/testing/tests/regression-suite/0802-Spec-LOCK-1.result
index db2de56f..96af3709 100644
--- a/testing/tests/regression-suite/0802-Spec-LOCK-1.result
+++ b/testing/tests/regression-suite/0802-Spec-LOCK-1.result
@@ -1,6 +1,7 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 Content-Length: 198
 Content-Type: text/xml; charset="utf-8"
 
diff --git a/testing/tests/regression-suite/0803-Mulberry-PUT-1.result b/testing/tests/regression-suite/0803-Mulberry-PUT-1.result
index 41129154..7e84a2f7 100644
--- a/testing/tests/regression-suite/0803-Mulberry-PUT-1.result
+++ b/testing/tests/regression-suite/0803-Mulberry-PUT-1.result
@@ -2,7 +2,8 @@ HTTP/1.1 100 Continue
 
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 Content-Length: 198
 Content-Type: text/xml; charset="utf-8"
 
diff --git a/testing/tests/regression-suite/0804-Mulberry-PUT-1.result b/testing/tests/regression-suite/0804-Mulberry-PUT-1.result
index 9918cb52..7976ee82 100644
--- a/testing/tests/regression-suite/0804-Mulberry-PUT-1.result
+++ b/testing/tests/regression-suite/0804-Mulberry-PUT-1.result
@@ -2,7 +2,8 @@ HTTP/1.1 100 Continue
 
 HTTP/1.1 201 Created
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 ETag: "ad17bc2c8f60cf87de4a9eaa82312dea"
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
diff --git a/testing/tests/regression-suite/0805-Mulberry-DELETE-1.result b/testing/tests/regression-suite/0805-Mulberry-DELETE-1.result
index db2de56f..96af3709 100644
--- a/testing/tests/regression-suite/0805-Mulberry-DELETE-1.result
+++ b/testing/tests/regression-suite/0805-Mulberry-DELETE-1.result
@@ -1,6 +1,7 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 Content-Length: 198
 Content-Type: text/xml; charset="utf-8"
 
diff --git a/testing/tests/regression-suite/0806-Mulberry-DELETE-1.result b/testing/tests/regression-suite/0806-Mulberry-DELETE-1.result
index a48975c9..86ec884a 100644
--- a/testing/tests/regression-suite/0806-Mulberry-DELETE-1.result
+++ b/testing/tests/regression-suite/0806-Mulberry-DELETE-1.result
@@ -1,6 +1,7 @@
 HTTP/1.1 204 No Content
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
 
diff --git a/testing/tests/regression-suite/0808-Spec-UNLOCK-1.result b/testing/tests/regression-suite/0808-Spec-UNLOCK-1.result
index 3e3373e5..2c49720b 100644
--- a/testing/tests/regression-suite/0808-Spec-UNLOCK-1.result
+++ b/testing/tests/regression-suite/0808-Spec-UNLOCK-1.result
@@ -1,6 +1,7 @@
 HTTP/1.1 204 No Content
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
 
diff --git a/testing/tests/regression-suite/0809-Spec-UNLOCK-1.result b/testing/tests/regression-suite/0809-Spec-UNLOCK-1.result
index 3e3373e5..2c49720b 100644
--- a/testing/tests/regression-suite/0809-Spec-UNLOCK-1.result
+++ b/testing/tests/regression-suite/0809-Spec-UNLOCK-1.result
@@ -1,6 +1,7 @@
 HTTP/1.1 204 No Content
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
 
diff --git a/testing/tests/regression-suite/0810-Spec-LOCK-1.result b/testing/tests/regression-suite/0810-Spec-LOCK-1.result
index 8c9b5b55..f199e12e 100644
--- a/testing/tests/regression-suite/0810-Spec-LOCK-1.result
+++ b/testing/tests/regression-suite/0810-Spec-LOCK-1.result
@@ -1,6 +1,7 @@
 HTTP/1.1 200 OK
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 Lock-Token: <opaquelocktoken:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx>
 Content-Length: 460
 Content-Type: text/xml; charset="utf-8"
diff --git a/testing/tests/regression-suite/0811-Spec-LOCK-1.result b/testing/tests/regression-suite/0811-Spec-LOCK-1.result
index 2ba20d6a..14e5c67f 100644
--- a/testing/tests/regression-suite/0811-Spec-LOCK-1.result
+++ b/testing/tests/regression-suite/0811-Spec-LOCK-1.result
@@ -1,6 +1,7 @@
 HTTP/1.1 200 OK
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 Content-Length: 460
 Content-Type: text/xml; charset="utf-8"
 
diff --git a/testing/tests/regression-suite/0812-Spec-LOCK-1.result b/testing/tests/regression-suite/0812-Spec-LOCK-1.result
index 6fbb3202..e96ccac9 100644
--- a/testing/tests/regression-suite/0812-Spec-LOCK-1.result
+++ b/testing/tests/regression-suite/0812-Spec-LOCK-1.result
@@ -1,6 +1,7 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 Content-Length: 183
 Content-Type: text/xml; charset="utf-8"
 
diff --git a/testing/tests/regression-suite/0815-Spec-UNLOCK-1.result b/testing/tests/regression-suite/0815-Spec-UNLOCK-1.result
index 6fbb3202..e96ccac9 100644
--- a/testing/tests/regression-suite/0815-Spec-UNLOCK-1.result
+++ b/testing/tests/regression-suite/0815-Spec-UNLOCK-1.result
@@ -1,6 +1,7 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 Content-Length: 183
 Content-Type: text/xml; charset="utf-8"
 
diff --git a/testing/tests/regression-suite/0816-Spec-UNLOCK-1.result b/testing/tests/regression-suite/0816-Spec-UNLOCK-1.result
index 3e3373e5..2c49720b 100644
--- a/testing/tests/regression-suite/0816-Spec-UNLOCK-1.result
+++ b/testing/tests/regression-suite/0816-Spec-UNLOCK-1.result
@@ -1,6 +1,7 @@
 HTTP/1.1 204 No Content
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
 
diff --git a/testing/tests/regression-suite/0817-Spec-PUT.result b/testing/tests/regression-suite/0817-Spec-PUT.result
index fd482705..7d4ef949 100644
--- a/testing/tests/regression-suite/0817-Spec-PUT.result
+++ b/testing/tests/regression-suite/0817-Spec-PUT.result
@@ -1,6 +1,7 @@
 HTTP/1.1 201 Created
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 ETag: "165746adbab8bc0c8336a63cc5332ff2"
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
diff --git a/testing/tests/regression-suite/0818-Spec-PUT.result b/testing/tests/regression-suite/0818-Spec-PUT.result
index ed3e6282..e2a03afe 100644
--- a/testing/tests/regression-suite/0818-Spec-PUT.result
+++ b/testing/tests/regression-suite/0818-Spec-PUT.result
@@ -1,6 +1,7 @@
 HTTP/1.1 201 Created
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 ETag: "8600dc4a1b264a09a5f741d710497cba"
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
diff --git a/testing/tests/regression-suite/0820-Spec-PROPFIND-1.result b/testing/tests/regression-suite/0820-Spec-PROPFIND-1.result
index 9e0edb8c..293bc0f4 100644
--- a/testing/tests/regression-suite/0820-Spec-PROPFIND-1.result
+++ b/testing/tests/regression-suite/0820-Spec-PROPFIND-1.result
@@ -48,30 +48,6 @@
        <privilege>
         <unbind/>
        </privilege>
-       <privilege>
-        <C:schedule-deliver/>
-       </privilege>
-       <privilege>
-        <C:schedule-deliver-invite/>
-       </privilege>
-       <privilege>
-        <C:schedule-deliver-reply/>
-       </privilege>
-       <privilege>
-        <C:schedule-query-freebusy/>
-       </privilege>
-       <privilege>
-        <C:schedule-send/>
-       </privilege>
-       <privilege>
-        <C:schedule-send-invite/>
-       </privilege>
-       <privilege>
-        <C:schedule-send-reply/>
-       </privilege>
-       <privilege>
-        <C:schedule-send-freebusy/>
-       </privilege>
       </grant>
      </ace>
      <ace>
@@ -100,9 +76,6 @@
        <privilege>
         <unbind/>
        </privilege>
-       <privilege>
-        <C:schedule-query-freebusy/>
-       </privilege>
       </grant>
      </ace>
      <ace>
@@ -116,9 +89,6 @@
        <privilege>
         <C:read-free-busy/>
        </privilege>
-       <privilege>
-        <C:schedule-query-freebusy/>
-       </privilege>
       </grant>
      </ace>
      <ace>
@@ -129,30 +99,6 @@
        <privilege>
         <C:read-free-busy/>
        </privilege>
-       <privilege>
-        <C:schedule-deliver/>
-       </privilege>
-       <privilege>
-        <C:schedule-deliver-invite/>
-       </privilege>
-       <privilege>
-        <C:schedule-deliver-reply/>
-       </privilege>
-       <privilege>
-        <C:schedule-query-freebusy/>
-       </privilege>
-       <privilege>
-        <C:schedule-send/>
-       </privilege>
-       <privilege>
-        <C:schedule-send-invite/>
-       </privilege>
-       <privilege>
-        <C:schedule-send-reply/>
-       </privilege>
-       <privilege>
-        <C:schedule-send-freebusy/>
-       </privilege>
       </grant>
      </ace>
     </acl>
diff --git a/testing/tests/regression-suite/0821-Spec-PROPFIND-2.result b/testing/tests/regression-suite/0821-Spec-PROPFIND-2.result
index 5d014aa8..f8252433 100644
--- a/testing/tests/regression-suite/0821-Spec-PROPFIND-2.result
+++ b/testing/tests/regression-suite/0821-Spec-PROPFIND-2.result
@@ -1,6 +1,7 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 ETag: "deadbeefcafefeeddeadbeefcafefeed"
 Content-Length: 1032
 Content-Type: text/xml; charset="utf-8"
diff --git a/testing/tests/regression-suite/0823-Spec-PROPFIND-4.result b/testing/tests/regression-suite/0823-Spec-PROPFIND-4.result
index 7ffc2eef..c64f4869 100644
--- a/testing/tests/regression-suite/0823-Spec-PROPFIND-4.result
+++ b/testing/tests/regression-suite/0823-Spec-PROPFIND-4.result
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<multistatus xmlns="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
+<multistatus xmlns="DAV:">
  <response>
   <href>/caldav.php/user1/home/da81c0ee-7871-11db-c6d6-f6927c144649.ics</href>
   <propstat>
@@ -30,9 +30,6 @@
        <privilege>
         <write-acl/>
        </privilege>
-       <privilege>
-        <C:read-free-busy/>
-       </privilege>
        <privilege>
         <write/>
        </privilege>
@@ -48,30 +45,6 @@
        <privilege>
         <unbind/>
        </privilege>
-       <privilege>
-        <C:schedule-deliver/>
-       </privilege>
-       <privilege>
-        <C:schedule-deliver-invite/>
-       </privilege>
-       <privilege>
-        <C:schedule-deliver-reply/>
-       </privilege>
-       <privilege>
-        <C:schedule-query-freebusy/>
-       </privilege>
-       <privilege>
-        <C:schedule-send/>
-       </privilege>
-       <privilege>
-        <C:schedule-send-invite/>
-       </privilege>
-       <privilege>
-        <C:schedule-send-reply/>
-       </privilege>
-       <privilege>
-        <C:schedule-send-freebusy/>
-       </privilege>
       </grant>
      </ace>
      <ace>
@@ -82,9 +55,6 @@
        <privilege>
         <read/>
        </privilege>
-       <privilege>
-        <C:read-free-busy/>
-       </privilege>
        <privilege>
         <write/>
        </privilege>
@@ -100,9 +70,6 @@
        <privilege>
         <unbind/>
        </privilege>
-       <privilege>
-        <C:schedule-query-freebusy/>
-       </privilege>
       </grant>
      </ace>
      <ace>
@@ -113,47 +80,13 @@
        <privilege>
         <read/>
        </privilege>
-       <privilege>
-        <C:read-free-busy/>
-       </privilege>
-       <privilege>
-        <C:schedule-query-freebusy/>
-       </privilege>
       </grant>
      </ace>
      <ace>
       <principal>
        <authenticated/>
       </principal>
-      <grant>
-       <privilege>
-        <C:read-free-busy/>
-       </privilege>
-       <privilege>
-        <C:schedule-deliver/>
-       </privilege>
-       <privilege>
-        <C:schedule-deliver-invite/>
-       </privilege>
-       <privilege>
-        <C:schedule-deliver-reply/>
-       </privilege>
-       <privilege>
-        <C:schedule-query-freebusy/>
-       </privilege>
-       <privilege>
-        <C:schedule-send/>
-       </privilege>
-       <privilege>
-        <C:schedule-send-invite/>
-       </privilege>
-       <privilege>
-        <C:schedule-send-reply/>
-       </privilege>
-       <privilege>
-        <C:schedule-send-freebusy/>
-       </privilege>
-      </grant>
+      <grant/>
      </ace>
     </acl>
     <creationdate>YYYY-MM-DDThh:mm:ss+ZZ:ZZ</creationdate>
diff --git a/testing/tests/regression-suite/0826-Spec-PROPFIND.result b/testing/tests/regression-suite/0826-Spec-PROPFIND.result
index 392d2638..143438d3 100644
--- a/testing/tests/regression-suite/0826-Spec-PROPFIND.result
+++ b/testing/tests/regression-suite/0826-Spec-PROPFIND.result
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<multistatus xmlns="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
+<multistatus xmlns="DAV:">
  <response>
   <href>/</href>
   <propstat>
@@ -30,9 +30,6 @@
        <privilege>
         <write-acl/>
        </privilege>
-       <privilege>
-        <C:read-free-busy/>
-       </privilege>
        <privilege>
         <write/>
        </privilege>
@@ -48,30 +45,6 @@
        <privilege>
         <unbind/>
        </privilege>
-       <privilege>
-        <C:schedule-deliver/>
-       </privilege>
-       <privilege>
-        <C:schedule-deliver-invite/>
-       </privilege>
-       <privilege>
-        <C:schedule-deliver-reply/>
-       </privilege>
-       <privilege>
-        <C:schedule-query-freebusy/>
-       </privilege>
-       <privilege>
-        <C:schedule-send/>
-       </privilege>
-       <privilege>
-        <C:schedule-send-invite/>
-       </privilege>
-       <privilege>
-        <C:schedule-send-reply/>
-       </privilege>
-       <privilege>
-        <C:schedule-send-freebusy/>
-       </privilege>
       </grant>
      </ace>
      <ace>
@@ -82,9 +55,6 @@
        <privilege>
         <read/>
        </privilege>
-       <privilege>
-        <C:read-free-busy/>
-       </privilege>
        <privilege>
         <write/>
        </privilege>
@@ -100,9 +70,6 @@
        <privilege>
         <unbind/>
        </privilege>
-       <privilege>
-        <C:schedule-query-freebusy/>
-       </privilege>
       </grant>
      </ace>
      <ace>
@@ -113,12 +80,6 @@
        <privilege>
         <read/>
        </privilege>
-       <privilege>
-        <C:read-free-busy/>
-       </privilege>
-       <privilege>
-        <C:schedule-query-freebusy/>
-       </privilege>
       </grant>
      </ace>
      <ace>
diff --git a/testing/tests/regression-suite/0827-Spec-PROPFIND.result b/testing/tests/regression-suite/0827-Spec-PROPFIND.result
index c7834239..692c4d93 100644
--- a/testing/tests/regression-suite/0827-Spec-PROPFIND.result
+++ b/testing/tests/regression-suite/0827-Spec-PROPFIND.result
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<multistatus xmlns="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
+<multistatus xmlns="DAV:">
  <response>
   <href>/</href>
   <propstat>
@@ -30,9 +30,6 @@
        <privilege>
         <write-acl/>
        </privilege>
-       <privilege>
-        <C:read-free-busy/>
-       </privilege>
        <privilege>
         <write/>
        </privilege>
@@ -48,30 +45,6 @@
        <privilege>
         <unbind/>
        </privilege>
-       <privilege>
-        <C:schedule-deliver/>
-       </privilege>
-       <privilege>
-        <C:schedule-deliver-invite/>
-       </privilege>
-       <privilege>
-        <C:schedule-deliver-reply/>
-       </privilege>
-       <privilege>
-        <C:schedule-query-freebusy/>
-       </privilege>
-       <privilege>
-        <C:schedule-send/>
-       </privilege>
-       <privilege>
-        <C:schedule-send-invite/>
-       </privilege>
-       <privilege>
-        <C:schedule-send-reply/>
-       </privilege>
-       <privilege>
-        <C:schedule-send-freebusy/>
-       </privilege>
       </grant>
      </ace>
      <ace>
@@ -82,9 +55,6 @@
        <privilege>
         <read/>
        </privilege>
-       <privilege>
-        <C:read-free-busy/>
-       </privilege>
        <privilege>
         <write/>
        </privilege>
@@ -100,9 +70,6 @@
        <privilege>
         <unbind/>
        </privilege>
-       <privilege>
-        <C:schedule-query-freebusy/>
-       </privilege>
       </grant>
      </ace>
      <ace>
@@ -113,12 +80,6 @@
        <privilege>
         <read/>
        </privilege>
-       <privilege>
-        <C:read-free-busy/>
-       </privilege>
-       <privilege>
-        <C:schedule-query-freebusy/>
-       </privilege>
       </grant>
      </ace>
      <ace>
@@ -201,9 +162,6 @@
        <privilege>
         <write-acl/>
        </privilege>
-       <privilege>
-        <C:read-free-busy/>
-       </privilege>
        <privilege>
         <write/>
        </privilege>
@@ -219,30 +177,6 @@
        <privilege>
         <unbind/>
        </privilege>
-       <privilege>
-        <C:schedule-deliver/>
-       </privilege>
-       <privilege>
-        <C:schedule-deliver-invite/>
-       </privilege>
-       <privilege>
-        <C:schedule-deliver-reply/>
-       </privilege>
-       <privilege>
-        <C:schedule-query-freebusy/>
-       </privilege>
-       <privilege>
-        <C:schedule-send/>
-       </privilege>
-       <privilege>
-        <C:schedule-send-invite/>
-       </privilege>
-       <privilege>
-        <C:schedule-send-reply/>
-       </privilege>
-       <privilege>
-        <C:schedule-send-freebusy/>
-       </privilege>
       </grant>
      </ace>
      <ace>
@@ -253,9 +187,6 @@
        <privilege>
         <read/>
        </privilege>
-       <privilege>
-        <C:read-free-busy/>
-       </privilege>
        <privilege>
         <write/>
        </privilege>
@@ -271,9 +202,6 @@
        <privilege>
         <unbind/>
        </privilege>
-       <privilege>
-        <C:schedule-query-freebusy/>
-       </privilege>
       </grant>
      </ace>
      <ace>
@@ -284,47 +212,13 @@
        <privilege>
         <read/>
        </privilege>
-       <privilege>
-        <C:read-free-busy/>
-       </privilege>
-       <privilege>
-        <C:schedule-query-freebusy/>
-       </privilege>
       </grant>
      </ace>
      <ace>
       <principal>
        <authenticated/>
       </principal>
-      <grant>
-       <privilege>
-        <C:read-free-busy/>
-       </privilege>
-       <privilege>
-        <C:schedule-deliver/>
-       </privilege>
-       <privilege>
-        <C:schedule-deliver-invite/>
-       </privilege>
-       <privilege>
-        <C:schedule-deliver-reply/>
-       </privilege>
-       <privilege>
-        <C:schedule-query-freebusy/>
-       </privilege>
-       <privilege>
-        <C:schedule-send/>
-       </privilege>
-       <privilege>
-        <C:schedule-send-invite/>
-       </privilege>
-       <privilege>
-        <C:schedule-send-reply/>
-       </privilege>
-       <privilege>
-        <C:schedule-send-freebusy/>
-       </privilege>
-      </grant>
+      <grant/>
      </ace>
     </acl>
     <creationdate>YYYY-MM-DDThh:mm:ss+ZZ:ZZ</creationdate>
@@ -479,9 +373,6 @@
        <privilege>
         <write-acl/>
        </privilege>
-       <privilege>
-        <C:read-free-busy/>
-       </privilege>
        <privilege>
         <write/>
        </privilege>
@@ -497,30 +388,6 @@
        <privilege>
         <unbind/>
        </privilege>
-       <privilege>
-        <C:schedule-deliver/>
-       </privilege>
-       <privilege>
-        <C:schedule-deliver-invite/>
-       </privilege>
-       <privilege>
-        <C:schedule-deliver-reply/>
-       </privilege>
-       <privilege>
-        <C:schedule-query-freebusy/>
-       </privilege>
-       <privilege>
-        <C:schedule-send/>
-       </privilege>
-       <privilege>
-        <C:schedule-send-invite/>
-       </privilege>
-       <privilege>
-        <C:schedule-send-reply/>
-       </privilege>
-       <privilege>
-        <C:schedule-send-freebusy/>
-       </privilege>
       </grant>
      </ace>
      <ace>
@@ -546,9 +413,6 @@
        <privilege>
         <write-acl/>
        </privilege>
-       <privilege>
-        <C:read-free-busy/>
-       </privilege>
        <privilege>
         <write/>
        </privilege>
@@ -564,30 +428,6 @@
        <privilege>
         <unbind/>
        </privilege>
-       <privilege>
-        <C:schedule-deliver/>
-       </privilege>
-       <privilege>
-        <C:schedule-deliver-invite/>
-       </privilege>
-       <privilege>
-        <C:schedule-deliver-reply/>
-       </privilege>
-       <privilege>
-        <C:schedule-query-freebusy/>
-       </privilege>
-       <privilege>
-        <C:schedule-send/>
-       </privilege>
-       <privilege>
-        <C:schedule-send-invite/>
-       </privilege>
-       <privilege>
-        <C:schedule-send-reply/>
-       </privilege>
-       <privilege>
-        <C:schedule-send-freebusy/>
-       </privilege>
       </grant>
      </ace>
      <ace>
@@ -598,33 +438,6 @@
        <privilege>
         <read/>
        </privilege>
-       <privilege>
-        <C:read-free-busy/>
-       </privilege>
-       <privilege>
-        <C:schedule-deliver/>
-       </privilege>
-       <privilege>
-        <C:schedule-deliver-invite/>
-       </privilege>
-       <privilege>
-        <C:schedule-deliver-reply/>
-       </privilege>
-       <privilege>
-        <C:schedule-query-freebusy/>
-       </privilege>
-       <privilege>
-        <C:schedule-send/>
-       </privilege>
-       <privilege>
-        <C:schedule-send-invite/>
-       </privilege>
-       <privilege>
-        <C:schedule-send-reply/>
-       </privilege>
-       <privilege>
-        <C:schedule-send-freebusy/>
-       </privilege>
       </grant>
      </ace>
     </acl>
@@ -692,9 +505,6 @@
        <privilege>
         <write-acl/>
        </privilege>
-       <privilege>
-        <C:read-free-busy/>
-       </privilege>
        <privilege>
         <write/>
        </privilege>
@@ -710,30 +520,6 @@
        <privilege>
         <unbind/>
        </privilege>
-       <privilege>
-        <C:schedule-deliver/>
-       </privilege>
-       <privilege>
-        <C:schedule-deliver-invite/>
-       </privilege>
-       <privilege>
-        <C:schedule-deliver-reply/>
-       </privilege>
-       <privilege>
-        <C:schedule-query-freebusy/>
-       </privilege>
-       <privilege>
-        <C:schedule-send/>
-       </privilege>
-       <privilege>
-        <C:schedule-send-invite/>
-       </privilege>
-       <privilege>
-        <C:schedule-send-reply/>
-       </privilege>
-       <privilege>
-        <C:schedule-send-freebusy/>
-       </privilege>
       </grant>
      </ace>
      <ace>
@@ -759,9 +545,6 @@
        <privilege>
         <write-acl/>
        </privilege>
-       <privilege>
-        <C:read-free-busy/>
-       </privilege>
        <privilege>
         <write/>
        </privilege>
@@ -777,30 +560,6 @@
        <privilege>
         <unbind/>
        </privilege>
-       <privilege>
-        <C:schedule-deliver/>
-       </privilege>
-       <privilege>
-        <C:schedule-deliver-invite/>
-       </privilege>
-       <privilege>
-        <C:schedule-deliver-reply/>
-       </privilege>
-       <privilege>
-        <C:schedule-query-freebusy/>
-       </privilege>
-       <privilege>
-        <C:schedule-send/>
-       </privilege>
-       <privilege>
-        <C:schedule-send-invite/>
-       </privilege>
-       <privilege>
-        <C:schedule-send-reply/>
-       </privilege>
-       <privilege>
-        <C:schedule-send-freebusy/>
-       </privilege>
       </grant>
      </ace>
      <ace>
@@ -811,33 +570,6 @@
        <privilege>
         <read/>
        </privilege>
-       <privilege>
-        <C:read-free-busy/>
-       </privilege>
-       <privilege>
-        <C:schedule-deliver/>
-       </privilege>
-       <privilege>
-        <C:schedule-deliver-invite/>
-       </privilege>
-       <privilege>
-        <C:schedule-deliver-reply/>
-       </privilege>
-       <privilege>
-        <C:schedule-query-freebusy/>
-       </privilege>
-       <privilege>
-        <C:schedule-send/>
-       </privilege>
-       <privilege>
-        <C:schedule-send-invite/>
-       </privilege>
-       <privilege>
-        <C:schedule-send-reply/>
-       </privilege>
-       <privilege>
-        <C:schedule-send-freebusy/>
-       </privilege>
       </grant>
      </ace>
     </acl>
diff --git a/testing/tests/regression-suite/0830-Spec-FREEBUSY-1.result b/testing/tests/regression-suite/0830-Spec-FREEBUSY-1.result
index 23e432f1..1140033a 100644
--- a/testing/tests/regression-suite/0830-Spec-FREEBUSY-1.result
+++ b/testing/tests/regression-suite/0830-Spec-FREEBUSY-1.result
@@ -1,6 +1,7 @@
 HTTP/1.1 200 OK
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 Content-Length: 1251
 Content-Type: text/calendar
 
diff --git a/testing/tests/regression-suite/0831-Spec-RRULE-1.result b/testing/tests/regression-suite/0831-Spec-RRULE-1.result
index 49e84fe9..604257a7 100644
--- a/testing/tests/regression-suite/0831-Spec-RRULE-1.result
+++ b/testing/tests/regression-suite/0831-Spec-RRULE-1.result
@@ -1,6 +1,7 @@
 HTTP/1.1 200 OK
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 Content-Length: 5323
 Content-Type: text/html
 
diff --git a/testing/tests/regression-suite/0834-Spec-FREEBUSY-1.result b/testing/tests/regression-suite/0834-Spec-FREEBUSY-1.result
index 0a9b3c17..7b285526 100644
--- a/testing/tests/regression-suite/0834-Spec-FREEBUSY-1.result
+++ b/testing/tests/regression-suite/0834-Spec-FREEBUSY-1.result
@@ -1,6 +1,7 @@
 HTTP/1.1 200 OK
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 Content-Length: 2704
 Content-Type: text/calendar
 
diff --git a/testing/tests/regression-suite/0838-Spec-LOCK.result b/testing/tests/regression-suite/0838-Spec-LOCK.result
index 8c9b5b55..f199e12e 100644
--- a/testing/tests/regression-suite/0838-Spec-LOCK.result
+++ b/testing/tests/regression-suite/0838-Spec-LOCK.result
@@ -1,6 +1,7 @@
 HTTP/1.1 200 OK
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 Lock-Token: <opaquelocktoken:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx>
 Content-Length: 460
 Content-Type: text/xml; charset="utf-8"
diff --git a/testing/tests/regression-suite/0839-Spec-UNLOCK-1.result b/testing/tests/regression-suite/0839-Spec-UNLOCK-1.result
index db2de56f..96af3709 100644
--- a/testing/tests/regression-suite/0839-Spec-UNLOCK-1.result
+++ b/testing/tests/regression-suite/0839-Spec-UNLOCK-1.result
@@ -1,6 +1,7 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 Content-Length: 198
 Content-Type: text/xml; charset="utf-8"
 
diff --git a/testing/tests/regression-suite/0840-Spec-PROPPATCH-1.result b/testing/tests/regression-suite/0840-Spec-PROPPATCH-1.result
index 0523b55e..f1e0fff2 100644
--- a/testing/tests/regression-suite/0840-Spec-PROPPATCH-1.result
+++ b/testing/tests/regression-suite/0840-Spec-PROPPATCH-1.result
@@ -1,6 +1,7 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 Content-Length: 742
 Content-Type: text/xml; charset="utf-8"
 
diff --git a/testing/tests/regression-suite/0841-Spec-PROPPATCH-2.result b/testing/tests/regression-suite/0841-Spec-PROPPATCH-2.result
index 3eadc5e7..c6cd8fe9 100644
--- a/testing/tests/regression-suite/0841-Spec-PROPPATCH-2.result
+++ b/testing/tests/regression-suite/0841-Spec-PROPPATCH-2.result
@@ -1,6 +1,7 @@
 HTTP/1.1 200 OK
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 Content-Length: 224
 Content-Type: text/xml; charset="utf-8"
 
diff --git a/testing/tests/regression-suite/0842-Spec-PROPPATCH-3.result b/testing/tests/regression-suite/0842-Spec-PROPPATCH-3.result
index 49502f65..3006da58 100644
--- a/testing/tests/regression-suite/0842-Spec-PROPPATCH-3.result
+++ b/testing/tests/regression-suite/0842-Spec-PROPPATCH-3.result
@@ -1,6 +1,7 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 Content-Length: 469
 Content-Type: text/xml; charset="utf-8"
 
diff --git a/testing/tests/regression-suite/0844-Spec-PROPPATCH-addressbook.result b/testing/tests/regression-suite/0844-Spec-PROPPATCH-addressbook.result
index 10d63fdb..3c9b1d41 100644
--- a/testing/tests/regression-suite/0844-Spec-PROPPATCH-addressbook.result
+++ b/testing/tests/regression-suite/0844-Spec-PROPPATCH-addressbook.result
@@ -1,6 +1,7 @@
 HTTP/1.1 200 OK
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 Content-Length: 224
 Content-Type: text/xml; charset="utf-8"
 
diff --git a/testing/tests/regression-suite/0844-Spec-PROPPATCH-principal.result b/testing/tests/regression-suite/0844-Spec-PROPPATCH-principal.result
index 8af0bb52..713939aa 100644
--- a/testing/tests/regression-suite/0844-Spec-PROPPATCH-principal.result
+++ b/testing/tests/regression-suite/0844-Spec-PROPPATCH-principal.result
@@ -1,6 +1,7 @@
 HTTP/1.1 200 OK
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 Content-Length: 219
 Content-Type: text/xml; charset="utf-8"
 
diff --git a/testing/tests/regression-suite/0845-Spec-PROPPATCH-both-fail.result b/testing/tests/regression-suite/0845-Spec-PROPPATCH-both-fail.result
index d5b34c13..694c5f3d 100644
--- a/testing/tests/regression-suite/0845-Spec-PROPPATCH-both-fail.result
+++ b/testing/tests/regression-suite/0845-Spec-PROPPATCH-both-fail.result
@@ -1,6 +1,7 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 Content-Length: 469
 Content-Type: text/xml; charset="utf-8"
 
diff --git a/testing/tests/regression-suite/0845-Spec-PROPPATCH-principal.result b/testing/tests/regression-suite/0845-Spec-PROPPATCH-principal.result
index 3bcd1582..8c8612de 100644
--- a/testing/tests/regression-suite/0845-Spec-PROPPATCH-principal.result
+++ b/testing/tests/regression-suite/0845-Spec-PROPPATCH-principal.result
@@ -1,6 +1,7 @@
 HTTP/1.1 200 OK
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 Content-Length: 219
 Content-Type: text/xml; charset="utf-8"
 
diff --git a/testing/tests/regression-suite/0846-Spec-PROPPATCH-calendar.result b/testing/tests/regression-suite/0846-Spec-PROPPATCH-calendar.result
index 69bde58a..85cd2fff 100644
--- a/testing/tests/regression-suite/0846-Spec-PROPPATCH-calendar.result
+++ b/testing/tests/regression-suite/0846-Spec-PROPPATCH-calendar.result
@@ -1,6 +1,7 @@
 HTTP/1.1 200 OK
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 Content-Length: 224
 Content-Type: text/xml; charset="utf-8"
 
diff --git a/testing/tests/regression-suite/0850-Spec-REPORT-1.result b/testing/tests/regression-suite/0850-Spec-REPORT-1.result
index a606d5e7..b07df404 100644
--- a/testing/tests/regression-suite/0850-Spec-REPORT-1.result
+++ b/testing/tests/regression-suite/0850-Spec-REPORT-1.result
@@ -1,6 +1,7 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 ETag: "26a689e219dfe12c47d9bdf005cee099"
 Content-Length: 1447
 Content-Type: text/xml; charset="utf-8"
diff --git a/testing/tests/regression-suite/0851-Spec-REPORT-1.result b/testing/tests/regression-suite/0851-Spec-REPORT-1.result
index 6afccb22..fafa9bf8 100644
--- a/testing/tests/regression-suite/0851-Spec-REPORT-1.result
+++ b/testing/tests/regression-suite/0851-Spec-REPORT-1.result
@@ -1,6 +1,7 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 ETag: "8a4795998583adf6b23d24f4a9e73448"
 Content-Length: 5019
 Content-Type: text/xml; charset="utf-8"
diff --git a/testing/tests/regression-suite/0860-Spec-REPORT-principal.result b/testing/tests/regression-suite/0860-Spec-REPORT-principal.result
index 7f1bc041..42ebb964 100644
--- a/testing/tests/regression-suite/0860-Spec-REPORT-principal.result
+++ b/testing/tests/regression-suite/0860-Spec-REPORT-principal.result
@@ -1,6 +1,7 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 ETag: "07474790757c5e1b526ce4901889d6d3"
 Content-Length: 68
 Content-Type: text/xml; charset="utf-8"
diff --git a/testing/tests/regression-suite/0861-Spec-REPORT-principal.result b/testing/tests/regression-suite/0861-Spec-REPORT-principal.result
index e0368f1c..bb3022ee 100644
--- a/testing/tests/regression-suite/0861-Spec-REPORT-principal.result
+++ b/testing/tests/regression-suite/0861-Spec-REPORT-principal.result
@@ -1,6 +1,7 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 ETag: "135496e5aa8c45c3ba999c28f7ffec62"
 Content-Length: 4037
 Content-Type: text/xml; charset="utf-8"
diff --git a/testing/tests/regression-suite/0862-Spec-REPORT-principal.result b/testing/tests/regression-suite/0862-Spec-REPORT-principal.result
index b8a1f94b..9afe4eda 100644
--- a/testing/tests/regression-suite/0862-Spec-REPORT-principal.result
+++ b/testing/tests/regression-suite/0862-Spec-REPORT-principal.result
@@ -1,6 +1,7 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 ETag: "0f4b3456426720dea03e25482da4057d"
 Content-Length: 1226
 Content-Type: text/xml; charset="utf-8"
diff --git a/testing/tests/regression-suite/0863-Spec-REPORT-principal.result b/testing/tests/regression-suite/0863-Spec-REPORT-principal.result
index 2582e19e..d0c0c3a2 100644
--- a/testing/tests/regression-suite/0863-Spec-REPORT-principal.result
+++ b/testing/tests/regression-suite/0863-Spec-REPORT-principal.result
@@ -1,6 +1,7 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 ETag: "a6dbbd586976d9978572b451ef5d39a3"
 Content-Length: 923
 Content-Type: text/xml; charset="utf-8"
diff --git a/testing/tests/regression-suite/0870-Principal-PROPFIND.result b/testing/tests/regression-suite/0870-Principal-PROPFIND.result
index 6fd25c9d..1b43b921 100644
--- a/testing/tests/regression-suite/0870-Principal-PROPFIND.result
+++ b/testing/tests/regression-suite/0870-Principal-PROPFIND.result
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<multistatus xmlns="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
+<multistatus xmlns="DAV:">
  <response>
   <href>/~user1/</href>
   <propstat>
@@ -30,9 +30,6 @@
        <privilege>
         <write-acl/>
        </privilege>
-       <privilege>
-        <C:read-free-busy/>
-       </privilege>
        <privilege>
         <write/>
        </privilege>
@@ -48,30 +45,6 @@
        <privilege>
         <unbind/>
        </privilege>
-       <privilege>
-        <C:schedule-deliver/>
-       </privilege>
-       <privilege>
-        <C:schedule-deliver-invite/>
-       </privilege>
-       <privilege>
-        <C:schedule-deliver-reply/>
-       </privilege>
-       <privilege>
-        <C:schedule-query-freebusy/>
-       </privilege>
-       <privilege>
-        <C:schedule-send/>
-       </privilege>
-       <privilege>
-        <C:schedule-send-invite/>
-       </privilege>
-       <privilege>
-        <C:schedule-send-reply/>
-       </privilege>
-       <privilege>
-        <C:schedule-send-freebusy/>
-       </privilege>
       </grant>
      </ace>
      <ace>
@@ -82,9 +55,6 @@
        <privilege>
         <read/>
        </privilege>
-       <privilege>
-        <C:read-free-busy/>
-       </privilege>
        <privilege>
         <write/>
        </privilege>
@@ -100,9 +70,6 @@
        <privilege>
         <unbind/>
        </privilege>
-       <privilege>
-        <C:schedule-query-freebusy/>
-       </privilege>
       </grant>
      </ace>
      <ace>
@@ -113,47 +80,13 @@
        <privilege>
         <read/>
        </privilege>
-       <privilege>
-        <C:read-free-busy/>
-       </privilege>
-       <privilege>
-        <C:schedule-query-freebusy/>
-       </privilege>
       </grant>
      </ace>
      <ace>
       <principal>
        <authenticated/>
       </principal>
-      <grant>
-       <privilege>
-        <C:read-free-busy/>
-       </privilege>
-       <privilege>
-        <C:schedule-deliver/>
-       </privilege>
-       <privilege>
-        <C:schedule-deliver-invite/>
-       </privilege>
-       <privilege>
-        <C:schedule-deliver-reply/>
-       </privilege>
-       <privilege>
-        <C:schedule-query-freebusy/>
-       </privilege>
-       <privilege>
-        <C:schedule-send/>
-       </privilege>
-       <privilege>
-        <C:schedule-send-invite/>
-       </privilege>
-       <privilege>
-        <C:schedule-send-reply/>
-       </privilege>
-       <privilege>
-        <C:schedule-send-freebusy/>
-       </privilege>
-      </grant>
+      <grant/>
      </ace>
     </acl>
     <creationdate>YYYY-MM-DDThh:mm:ss+ZZ:ZZ</creationdate>
diff --git a/testing/tests/regression-suite/0871-PROPFIND.result b/testing/tests/regression-suite/0871-PROPFIND.result
index 77a6ffcf..71074a8c 100644
--- a/testing/tests/regression-suite/0871-PROPFIND.result
+++ b/testing/tests/regression-suite/0871-PROPFIND.result
@@ -1,6 +1,7 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 ETag: "5a27c5837af93fae40df868c04319afe"
 Content-Length: 522
 Content-Type: text/xml; charset="utf-8"
diff --git a/testing/tests/regression-suite/0872-PROPFIND.result b/testing/tests/regression-suite/0872-PROPFIND.result
index c351a393..aa449e30 100644
--- a/testing/tests/regression-suite/0872-PROPFIND.result
+++ b/testing/tests/regression-suite/0872-PROPFIND.result
@@ -1,6 +1,7 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 ETag: "a2acaf7821539c5e1042ee118c21a3f0"
 Content-Length: 2386
 Content-Type: text/xml; charset="utf-8"
diff --git a/testing/tests/regression-suite/0873-GroupDAV-PROPFIND.result b/testing/tests/regression-suite/0873-GroupDAV-PROPFIND.result
index c6a2e80b..384ceae9 100644
--- a/testing/tests/regression-suite/0873-GroupDAV-PROPFIND.result
+++ b/testing/tests/regression-suite/0873-GroupDAV-PROPFIND.result
@@ -1,8 +1,9 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 ETag: "some valid etag"
-Content-Length: 8564
+Content-Length: 6779
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
@@ -73,9 +74,6 @@ Content-Type: text/xml; charset="utf-8"
      <privilege>
       <write-acl/>
      </privilege>
-     <privilege>
-      <C:read-free-busy/>
-     </privilege>
      <privilege>
       <write/>
      </privilege>
@@ -91,30 +89,6 @@ Content-Type: text/xml; charset="utf-8"
      <privilege>
       <unbind/>
      </privilege>
-     <privilege>
-      <C:schedule-deliver/>
-     </privilege>
-     <privilege>
-      <C:schedule-deliver-invite/>
-     </privilege>
-     <privilege>
-      <C:schedule-deliver-reply/>
-     </privilege>
-     <privilege>
-      <C:schedule-query-freebusy/>
-     </privilege>
-     <privilege>
-      <C:schedule-send/>
-     </privilege>
-     <privilege>
-      <C:schedule-send-invite/>
-     </privilege>
-     <privilege>
-      <C:schedule-send-reply/>
-     </privilege>
-     <privilege>
-      <C:schedule-send-freebusy/>
-     </privilege>
     </current-user-privilege-set>
     <C2:getctag>some valid etag</C2:getctag>
    </prop>
@@ -228,9 +202,6 @@ Content-Type: text/xml; charset="utf-8"
      <privilege>
       <write-acl/>
      </privilege>
-     <privilege>
-      <C:read-free-busy/>
-     </privilege>
      <privilege>
       <write/>
      </privilege>
@@ -246,30 +217,6 @@ Content-Type: text/xml; charset="utf-8"
      <privilege>
       <unbind/>
      </privilege>
-     <privilege>
-      <C:schedule-deliver/>
-     </privilege>
-     <privilege>
-      <C:schedule-deliver-invite/>
-     </privilege>
-     <privilege>
-      <C:schedule-deliver-reply/>
-     </privilege>
-     <privilege>
-      <C:schedule-query-freebusy/>
-     </privilege>
-     <privilege>
-      <C:schedule-send/>
-     </privilege>
-     <privilege>
-      <C:schedule-send-invite/>
-     </privilege>
-     <privilege>
-      <C:schedule-send-reply/>
-     </privilege>
-     <privilege>
-      <C:schedule-send-freebusy/>
-     </privilege>
     </current-user-privilege-set>
     <C2:getctag>some valid etag</C2:getctag>
    </prop>
@@ -317,9 +264,6 @@ Content-Type: text/xml; charset="utf-8"
      <privilege>
       <write-acl/>
      </privilege>
-     <privilege>
-      <C:read-free-busy/>
-     </privilege>
      <privilege>
       <write/>
      </privilege>
@@ -335,30 +279,6 @@ Content-Type: text/xml; charset="utf-8"
      <privilege>
       <unbind/>
      </privilege>
-     <privilege>
-      <C:schedule-deliver/>
-     </privilege>
-     <privilege>
-      <C:schedule-deliver-invite/>
-     </privilege>
-     <privilege>
-      <C:schedule-deliver-reply/>
-     </privilege>
-     <privilege>
-      <C:schedule-query-freebusy/>
-     </privilege>
-     <privilege>
-      <C:schedule-send/>
-     </privilege>
-     <privilege>
-      <C:schedule-send-invite/>
-     </privilege>
-     <privilege>
-      <C:schedule-send-reply/>
-     </privilege>
-     <privilege>
-      <C:schedule-send-freebusy/>
-     </privilege>
     </current-user-privilege-set>
     <C2:getctag>some valid etag</C2:getctag>
    </prop>
diff --git a/testing/tests/regression-suite/0874-PROPFIND.result b/testing/tests/regression-suite/0874-PROPFIND.result
index 619c7ff7..2941e4e9 100644
--- a/testing/tests/regression-suite/0874-PROPFIND.result
+++ b/testing/tests/regression-suite/0874-PROPFIND.result
@@ -1,6 +1,7 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 ETag: "db14e561f31da3f7787f47ce081c2537"
 Content-Length: 4150
 Content-Type: text/xml; charset="utf-8"
diff --git a/testing/tests/regression-suite/0900-Moz-REPORT.result b/testing/tests/regression-suite/0900-Moz-REPORT.result
index d0739d3b..ede10311 100644
--- a/testing/tests/regression-suite/0900-Moz-REPORT.result
+++ b/testing/tests/regression-suite/0900-Moz-REPORT.result
@@ -1,6 +1,7 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 ETag: "064d0dec288b53bef0f91734d355a42a"
 Content-Length: 6389
 Content-Type: text/xml; charset="utf-8"
diff --git a/testing/tests/regression-suite/0901-GET-Collection.result b/testing/tests/regression-suite/0901-GET-Collection.result
index 722ea2de..bbd26a43 100644
--- a/testing/tests/regression-suite/0901-GET-Collection.result
+++ b/testing/tests/regression-suite/0901-GET-Collection.result
@@ -1,6 +1,7 @@
 HTTP/1.1 200 OK
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 Content-Length: 10307
 Etag: "735679d819034badbcddd8aa6029bc3d"
 Content-Type: text/calendar; charset="utf-8"
diff --git a/testing/tests/regression-suite/0902-PUT-collection.result b/testing/tests/regression-suite/0902-PUT-collection.result
index 80669a94..7e6b6e11 100644
--- a/testing/tests/regression-suite/0902-PUT-collection.result
+++ b/testing/tests/regression-suite/0902-PUT-collection.result
@@ -2,7 +2,8 @@ HTTP/1.1 100 Continue
 
 HTTP/1.1 200 OK
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
 
diff --git a/testing/tests/regression-suite/0903-GET-Collection.result b/testing/tests/regression-suite/0903-GET-Collection.result
index dbef4160..f0ff6c43 100644
--- a/testing/tests/regression-suite/0903-GET-Collection.result
+++ b/testing/tests/regression-suite/0903-GET-Collection.result
@@ -1,6 +1,7 @@
 HTTP/1.1 200 OK
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 Content-Length: 24646
 Etag: "a52157c35d64e6051e54024625d3a94a"
 Content-Type: text/calendar; charset="utf-8"
diff --git a/testing/tests/regression-suite/0910-Space-OPTIONS.result b/testing/tests/regression-suite/0910-Space-OPTIONS.result
index e8f7826b..1c685563 100644
--- a/testing/tests/regression-suite/0910-Space-OPTIONS.result
+++ b/testing/tests/regression-suite/0910-Space-OPTIONS.result
@@ -1,6 +1,7 @@
 HTTP/1.1 200 OK
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 Allow: OPTIONS, PROPFIND, REPORT, DELETE, LOCK, UNLOCK, MOVE, GET, PUT, HEAD, MKTICKET, DELTICKET
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
diff --git a/testing/tests/regression-suite/0911-Space-MKCALENDAR.result b/testing/tests/regression-suite/0911-Space-MKCALENDAR.result
index 067ed157..fe100e77 100644
--- a/testing/tests/regression-suite/0911-Space-MKCALENDAR.result
+++ b/testing/tests/regression-suite/0911-Space-MKCALENDAR.result
@@ -1,6 +1,7 @@
 HTTP/1.1 201 Created
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 Cache-Control: no-cache
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
diff --git a/testing/tests/regression-suite/0912-Space-PROPFIND.result b/testing/tests/regression-suite/0912-Space-PROPFIND.result
index fa813ebc..c6e5abce 100644
--- a/testing/tests/regression-suite/0912-Space-PROPFIND.result
+++ b/testing/tests/regression-suite/0912-Space-PROPFIND.result
@@ -1,6 +1,7 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 ETag: "bcb966ee1b9c5a114f71aef825b87ae6"
 Content-Length: 3827
 Content-Type: text/xml; charset="utf-8"
diff --git a/testing/tests/regression-suite/0913-extended-MKCOL.result b/testing/tests/regression-suite/0913-extended-MKCOL.result
index 8134c42b..ecc9b261 100644
--- a/testing/tests/regression-suite/0913-extended-MKCOL.result
+++ b/testing/tests/regression-suite/0913-extended-MKCOL.result
@@ -1,6 +1,7 @@
 HTTP/1.1 201 Created
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 Cache-Control: no-cache
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
diff --git a/testing/tests/regression-suite/0914-extended-MKCOL.result b/testing/tests/regression-suite/0914-extended-MKCOL.result
index 9d04c589..16a6971e 100644
--- a/testing/tests/regression-suite/0914-extended-MKCOL.result
+++ b/testing/tests/regression-suite/0914-extended-MKCOL.result
@@ -1,6 +1,7 @@
 HTTP/1.1 201 Created
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 Cache-Control: no-cache
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
diff --git a/testing/tests/regression-suite/0915-extended-MKCOL.result b/testing/tests/regression-suite/0915-extended-MKCOL.result
index 9a3aceca..3e98e19d 100644
--- a/testing/tests/regression-suite/0915-extended-MKCOL.result
+++ b/testing/tests/regression-suite/0915-extended-MKCOL.result
@@ -1,6 +1,7 @@
 HTTP/1.1 409 Conflict
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 Content-Length: 430
 Content-Type: text/plain; charset="utf-8"
 
diff --git a/testing/tests/regression-suite/0916-PROPFIND-supported-stuff.result b/testing/tests/regression-suite/0916-PROPFIND-supported-stuff.result
index 8f96149e..b94be299 100644
--- a/testing/tests/regression-suite/0916-PROPFIND-supported-stuff.result
+++ b/testing/tests/regression-suite/0916-PROPFIND-supported-stuff.result
@@ -1,6 +1,7 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 ETag: "8d5e76c5b7b5676fc36e38cfad77c5db"
 Content-Length: 1277
 Content-Type: text/xml; charset="utf-8"
diff --git a/testing/tests/regression-suite/0917-PROPFIND-supported-stuff.result b/testing/tests/regression-suite/0917-PROPFIND-supported-stuff.result
index 086f091f..a2692f8c 100644
--- a/testing/tests/regression-suite/0917-PROPFIND-supported-stuff.result
+++ b/testing/tests/regression-suite/0917-PROPFIND-supported-stuff.result
@@ -1,6 +1,7 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 ETag: "6b4e073faec32eb35d9de94349f13161"
 Content-Length: 1574
 Content-Type: text/xml; charset="utf-8"
diff --git a/testing/tests/regression-suite/0918-PROPFIND-supported-stuff.result b/testing/tests/regression-suite/0918-PROPFIND-supported-stuff.result
index ca63bcce..4379d824 100644
--- a/testing/tests/regression-suite/0918-PROPFIND-supported-stuff.result
+++ b/testing/tests/regression-suite/0918-PROPFIND-supported-stuff.result
@@ -1,6 +1,7 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 ETag: "c0a1811cd91f4f840744ddfb3da067a3"
 Content-Length: 2120
 Content-Type: text/xml; charset="utf-8"
diff --git a/testing/tests/regression-suite/0919-PROPFIND-supported-stuff.result b/testing/tests/regression-suite/0919-PROPFIND-supported-stuff.result
index fbfe8e8a..e6768a7e 100644
--- a/testing/tests/regression-suite/0919-PROPFIND-supported-stuff.result
+++ b/testing/tests/regression-suite/0919-PROPFIND-supported-stuff.result
@@ -1,6 +1,7 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 ETag: "88df59252290d58630f83da5be2a6405"
 Content-Length: 1663
 Content-Type: text/xml; charset="utf-8"
diff --git a/testing/tests/regression-suite/0920-PROPFIND-supported-stuff.result b/testing/tests/regression-suite/0920-PROPFIND-supported-stuff.result
index 4992a45a..9f0fdc27 100644
--- a/testing/tests/regression-suite/0920-PROPFIND-supported-stuff.result
+++ b/testing/tests/regression-suite/0920-PROPFIND-supported-stuff.result
@@ -1,6 +1,7 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 ETag: "f4ace4415ef70e47f318ae774aaaac48"
 Content-Length: 1636
 Content-Type: text/xml; charset="utf-8"
diff --git a/testing/tests/regression-suite/0922-PROPFIND-supported-stuff.result b/testing/tests/regression-suite/0922-PROPFIND-supported-stuff.result
index c777f922..9b0ac0ae 100644
--- a/testing/tests/regression-suite/0922-PROPFIND-supported-stuff.result
+++ b/testing/tests/regression-suite/0922-PROPFIND-supported-stuff.result
@@ -1,6 +1,7 @@
 HTTP/1.1 404 Not Found
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 Content-Length: 44
 Content-Type: text/plain; charset="utf-8"
 
diff --git a/testing/tests/regression-suite/0923-PROPFIND-supported-stuff.result b/testing/tests/regression-suite/0923-PROPFIND-supported-stuff.result
index c777f922..9b0ac0ae 100644
--- a/testing/tests/regression-suite/0923-PROPFIND-supported-stuff.result
+++ b/testing/tests/regression-suite/0923-PROPFIND-supported-stuff.result
@@ -1,6 +1,7 @@
 HTTP/1.1 404 Not Found
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 Content-Length: 44
 Content-Type: text/plain; charset="utf-8"
 
diff --git a/testing/tests/regression-suite/0924-MOVE-a.result b/testing/tests/regression-suite/0924-MOVE-a.result
index 2a5b4f13..322c9d28 100644
--- a/testing/tests/regression-suite/0924-MOVE-a.result
+++ b/testing/tests/regression-suite/0924-MOVE-a.result
@@ -1,6 +1,7 @@
 HTTP/1.1 409 Conflict
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 Content-Length: 37
 Content-Type: text/plain; charset="utf-8"
 
diff --git a/testing/tests/regression-suite/0924-MOVE.result b/testing/tests/regression-suite/0924-MOVE.result
index 77cb90d9..ffc9278c 100644
--- a/testing/tests/regression-suite/0924-MOVE.result
+++ b/testing/tests/regression-suite/0924-MOVE.result
@@ -1,6 +1,7 @@
 HTTP/1.1 200 OK
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
 
diff --git a/testing/tests/regression-suite/0925-MOVE.result b/testing/tests/regression-suite/0925-MOVE.result
index e58004aa..ed6fab58 100644
--- a/testing/tests/regression-suite/0925-MOVE.result
+++ b/testing/tests/regression-suite/0925-MOVE.result
@@ -1,6 +1,7 @@
 HTTP/1.1 200 OK
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
 
diff --git a/testing/tests/regression-suite/0926-MOVE.result b/testing/tests/regression-suite/0926-MOVE.result
index b6c4eb70..b2f94326 100644
--- a/testing/tests/regression-suite/0926-MOVE.result
+++ b/testing/tests/regression-suite/0926-MOVE.result
@@ -1,6 +1,7 @@
 HTTP/1.1 200 OK
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
 
diff --git a/testing/tests/regression-suite/0927-MOVE.result b/testing/tests/regression-suite/0927-MOVE.result
index e58004aa..ed6fab58 100644
--- a/testing/tests/regression-suite/0927-MOVE.result
+++ b/testing/tests/regression-suite/0927-MOVE.result
@@ -1,6 +1,7 @@
 HTTP/1.1 200 OK
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
 
diff --git a/testing/tests/regression-suite/0928-MOVE.result b/testing/tests/regression-suite/0928-MOVE.result
index 547799cd..50f94448 100644
--- a/testing/tests/regression-suite/0928-MOVE.result
+++ b/testing/tests/regression-suite/0928-MOVE.result
@@ -1,6 +1,7 @@
 HTTP/1.1 200 OK
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
 
diff --git a/testing/tests/regression-suite/0929-MOVE.result b/testing/tests/regression-suite/0929-MOVE.result
index 47965e36..10400963 100644
--- a/testing/tests/regression-suite/0929-MOVE.result
+++ b/testing/tests/regression-suite/0929-MOVE.result
@@ -1,6 +1,7 @@
 HTTP/1.1 200 OK
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
 
diff --git a/testing/tests/regression-suite/0930-REPORT-expand-property.result b/testing/tests/regression-suite/0930-REPORT-expand-property.result
index 41ea214a..22173411 100644
--- a/testing/tests/regression-suite/0930-REPORT-expand-property.result
+++ b/testing/tests/regression-suite/0930-REPORT-expand-property.result
@@ -1,6 +1,7 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 ETag: "3fc7af8b9dcea1aa7ead9fa8cfeb7efd"
 Content-Length: 3601
 Content-Type: text/xml; charset="utf-8"
diff --git a/testing/tests/regression-suite/0931-REPORT-expand-property.result b/testing/tests/regression-suite/0931-REPORT-expand-property.result
index 62102f92..846e1e34 100644
--- a/testing/tests/regression-suite/0931-REPORT-expand-property.result
+++ b/testing/tests/regression-suite/0931-REPORT-expand-property.result
@@ -1,6 +1,7 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 ETag: "0d81b1b934eb738f04a8d9aee626b2f4"
 Content-Length: 3759
 Content-Type: text/xml; charset="utf-8"
diff --git a/testing/tests/regression-suite/0932-PROPFIND-ish-misformed-request.result b/testing/tests/regression-suite/0932-PROPFIND-ish-misformed-request.result
index a1709042..097a2383 100644
--- a/testing/tests/regression-suite/0932-PROPFIND-ish-misformed-request.result
+++ b/testing/tests/regression-suite/0932-PROPFIND-ish-misformed-request.result
@@ -1,6 +1,7 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 ETag: "0c775c871b7748cdf156461686ccb5eb"
 Content-Length: 215
 Content-Type: text/xml; charset="utf-8"
diff --git a/testing/tests/regression-suite/0933-PROPFIND-supported-privilege-set.result b/testing/tests/regression-suite/0933-PROPFIND-supported-privilege-set.result
index c8ff1577..ded51066 100644
--- a/testing/tests/regression-suite/0933-PROPFIND-supported-privilege-set.result
+++ b/testing/tests/regression-suite/0933-PROPFIND-supported-privilege-set.result
@@ -1,6 +1,7 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 ETag: "ad3defe4bec3b3af2799d11bf03c5f40"
 Content-Length: 4144
 Content-Type: text/xml; charset="utf-8"
diff --git a/testing/tests/regression-suite/0934-PROPFIND-acl.result b/testing/tests/regression-suite/0934-PROPFIND-acl.result
index 360e54a7..032a838b 100644
--- a/testing/tests/regression-suite/0934-PROPFIND-acl.result
+++ b/testing/tests/regression-suite/0934-PROPFIND-acl.result
@@ -1,12 +1,13 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
-ETag: "f77289f499b29c349a55dfa7c887f41a"
-Content-Length: 3279
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+ETag: "47b370190326c7940b29c0231e7d9ed1"
+Content-Length: 2304
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
-<multistatus xmlns="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
+<multistatus xmlns="DAV:">
  <response>
   <href>/caldav.php/</href>
   <propstat>
@@ -37,9 +38,6 @@ Content-Type: text/xml; charset="utf-8"
        <privilege>
         <write-acl/>
        </privilege>
-       <privilege>
-        <C:read-free-busy/>
-       </privilege>
        <privilege>
         <write/>
        </privilege>
@@ -55,30 +53,6 @@ Content-Type: text/xml; charset="utf-8"
        <privilege>
         <unbind/>
        </privilege>
-       <privilege>
-        <C:schedule-deliver/>
-       </privilege>
-       <privilege>
-        <C:schedule-deliver-invite/>
-       </privilege>
-       <privilege>
-        <C:schedule-deliver-reply/>
-       </privilege>
-       <privilege>
-        <C:schedule-query-freebusy/>
-       </privilege>
-       <privilege>
-        <C:schedule-send/>
-       </privilege>
-       <privilege>
-        <C:schedule-send-invite/>
-       </privilege>
-       <privilege>
-        <C:schedule-send-reply/>
-       </privilege>
-       <privilege>
-        <C:schedule-send-freebusy/>
-       </privilege>
       </grant>
      </ace>
      <ace>
@@ -89,9 +63,6 @@ Content-Type: text/xml; charset="utf-8"
        <privilege>
         <read/>
        </privilege>
-       <privilege>
-        <C:read-free-busy/>
-       </privilege>
        <privilege>
         <write/>
        </privilege>
@@ -107,9 +78,6 @@ Content-Type: text/xml; charset="utf-8"
        <privilege>
         <unbind/>
        </privilege>
-       <privilege>
-        <C:schedule-query-freebusy/>
-       </privilege>
       </grant>
      </ace>
      <ace>
@@ -120,12 +88,6 @@ Content-Type: text/xml; charset="utf-8"
        <privilege>
         <read/>
        </privilege>
-       <privilege>
-        <C:read-free-busy/>
-       </privilege>
-       <privilege>
-        <C:schedule-query-freebusy/>
-       </privilege>
       </grant>
      </ace>
      <ace>
diff --git a/testing/tests/regression-suite/0935-PROPFIND-acl.result b/testing/tests/regression-suite/0935-PROPFIND-acl.result
index b1b57762..4652aaad 100644
--- a/testing/tests/regression-suite/0935-PROPFIND-acl.result
+++ b/testing/tests/regression-suite/0935-PROPFIND-acl.result
@@ -1,12 +1,13 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
-ETag: "5cbcaed6b7f479b9a063da87cf26bded"
-Content-Length: 3468
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+ETag: "bb9774ca300b3d2a6ce694e6326a8673"
+Content-Length: 1830
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
-<multistatus xmlns="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
+<multistatus xmlns="DAV:">
  <response>
   <href>/caldav.php/user1/</href>
   <propstat>
@@ -37,9 +38,6 @@ Content-Type: text/xml; charset="utf-8"
        <privilege>
         <write-acl/>
        </privilege>
-       <privilege>
-        <C:read-free-busy/>
-       </privilege>
        <privilege>
         <write/>
        </privilege>
@@ -55,30 +53,6 @@ Content-Type: text/xml; charset="utf-8"
        <privilege>
         <unbind/>
        </privilege>
-       <privilege>
-        <C:schedule-deliver/>
-       </privilege>
-       <privilege>
-        <C:schedule-deliver-invite/>
-       </privilege>
-       <privilege>
-        <C:schedule-deliver-reply/>
-       </privilege>
-       <privilege>
-        <C:schedule-query-freebusy/>
-       </privilege>
-       <privilege>
-        <C:schedule-send/>
-       </privilege>
-       <privilege>
-        <C:schedule-send-invite/>
-       </privilege>
-       <privilege>
-        <C:schedule-send-reply/>
-       </privilege>
-       <privilege>
-        <C:schedule-send-freebusy/>
-       </privilege>
       </grant>
      </ace>
      <ace>
@@ -89,9 +63,6 @@ Content-Type: text/xml; charset="utf-8"
        <privilege>
         <read/>
        </privilege>
-       <privilege>
-        <C:read-free-busy/>
-       </privilege>
        <privilege>
         <write/>
        </privilege>
@@ -107,9 +78,6 @@ Content-Type: text/xml; charset="utf-8"
        <privilege>
         <unbind/>
        </privilege>
-       <privilege>
-        <C:schedule-query-freebusy/>
-       </privilege>
       </grant>
      </ace>
      <ace>
@@ -120,47 +88,13 @@ Content-Type: text/xml; charset="utf-8"
        <privilege>
         <read/>
        </privilege>
-       <privilege>
-        <C:read-free-busy/>
-       </privilege>
-       <privilege>
-        <C:schedule-query-freebusy/>
-       </privilege>
       </grant>
      </ace>
      <ace>
       <principal>
        <authenticated/>
       </principal>
-      <grant>
-       <privilege>
-        <C:read-free-busy/>
-       </privilege>
-       <privilege>
-        <C:schedule-deliver/>
-       </privilege>
-       <privilege>
-        <C:schedule-deliver-invite/>
-       </privilege>
-       <privilege>
-        <C:schedule-deliver-reply/>
-       </privilege>
-       <privilege>
-        <C:schedule-query-freebusy/>
-       </privilege>
-       <privilege>
-        <C:schedule-send/>
-       </privilege>
-       <privilege>
-        <C:schedule-send-invite/>
-       </privilege>
-       <privilege>
-        <C:schedule-send-reply/>
-       </privilege>
-       <privilege>
-        <C:schedule-send-freebusy/>
-       </privilege>
-      </grant>
+      <grant/>
      </ace>
     </acl>
    </prop>
diff --git a/testing/tests/regression-suite/0936-PROPFIND-acl-restrictions.result b/testing/tests/regression-suite/0936-PROPFIND-acl-restrictions.result
index ed45da08..01d5e214 100644
--- a/testing/tests/regression-suite/0936-PROPFIND-acl-restrictions.result
+++ b/testing/tests/regression-suite/0936-PROPFIND-acl-restrictions.result
@@ -1,6 +1,7 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 ETag: "b7aa82d645859eafdf0c41ad74490024"
 Content-Length: 309
 Content-Type: text/xml; charset="utf-8"
diff --git a/testing/tests/regression-suite/0937-PROPFIND-inherited-acl-set.result b/testing/tests/regression-suite/0937-PROPFIND-inherited-acl-set.result
index 7331d543..565c58d1 100644
--- a/testing/tests/regression-suite/0937-PROPFIND-inherited-acl-set.result
+++ b/testing/tests/regression-suite/0937-PROPFIND-inherited-acl-set.result
@@ -1,6 +1,7 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 ETag: "049914e7ea4ed4db2a7a2a1c2494e0d4"
 Content-Length: 250
 Content-Type: text/xml; charset="utf-8"
diff --git a/testing/tests/regression-suite/0938-PROPFIND-inherited-acl-set.result b/testing/tests/regression-suite/0938-PROPFIND-inherited-acl-set.result
index cc57d75c..b32afd94 100644
--- a/testing/tests/regression-suite/0938-PROPFIND-inherited-acl-set.result
+++ b/testing/tests/regression-suite/0938-PROPFIND-inherited-acl-set.result
@@ -1,6 +1,7 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 ETag: "5ff44edb9e8734dee700ac29aa6df3be"
 Content-Length: 255
 Content-Type: text/xml; charset="utf-8"
diff --git a/testing/tests/regression-suite/0939-PROPFIND-inherited-acl-set.result b/testing/tests/regression-suite/0939-PROPFIND-inherited-acl-set.result
index f662a922..4abb3bfb 100644
--- a/testing/tests/regression-suite/0939-PROPFIND-inherited-acl-set.result
+++ b/testing/tests/regression-suite/0939-PROPFIND-inherited-acl-set.result
@@ -1,6 +1,7 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 ETag: "0c6459e59e9b002c2a4519db2b28f562"
 Content-Length: 341
 Content-Type: text/xml; charset="utf-8"
diff --git a/testing/tests/regression-suite/0940-PROPFIND-acl.result b/testing/tests/regression-suite/0940-PROPFIND-acl.result
index f7dc54c0..7dc77626 100644
--- a/testing/tests/regression-suite/0940-PROPFIND-acl.result
+++ b/testing/tests/regression-suite/0940-PROPFIND-acl.result
@@ -1,6 +1,7 @@
 HTTP/1.1 403 Forbidden
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 Content-Length: 214
 Content-Type: text/xml; charset="utf-8"
 
diff --git a/testing/tests/regression-suite/0941-GET-resource-denied.result b/testing/tests/regression-suite/0941-GET-resource-denied.result
index b7734ae9..091e833b 100644
--- a/testing/tests/regression-suite/0941-GET-resource-denied.result
+++ b/testing/tests/regression-suite/0941-GET-resource-denied.result
@@ -1,6 +1,7 @@
 HTTP/1.1 200 OK
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 Etag: "c3658901fd4689d4a1e1d6f08601ef4f"
 Content-Length: 1059
 Content-Type: text/calendar; charset="utf-8"
diff --git a/testing/tests/regression-suite/0942-REPORT-principal-property-search.result b/testing/tests/regression-suite/0942-REPORT-principal-property-search.result
index 00eb4f27..21d22f79 100644
--- a/testing/tests/regression-suite/0942-REPORT-principal-property-search.result
+++ b/testing/tests/regression-suite/0942-REPORT-principal-property-search.result
@@ -1,6 +1,7 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 ETag: "63123b75248ffab16849fec6c2e2846d"
 Content-Length: 3880
 Content-Type: text/xml; charset="utf-8"
diff --git a/testing/tests/regression-suite/0943-REPORT-principal-search-property-set.result b/testing/tests/regression-suite/0943-REPORT-principal-search-property-set.result
index 1237fcdf..bd024ff0 100644
--- a/testing/tests/regression-suite/0943-REPORT-principal-search-property-set.result
+++ b/testing/tests/regression-suite/0943-REPORT-principal-search-property-set.result
@@ -1,6 +1,7 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 ETag: "2fd111eb3507f4af36d65e9516255fa9"
 Content-Length: 470
 Content-Type: text/xml; charset="utf-8"
diff --git a/testing/tests/regression-suite/0944-REPORT-principal-property-search.result b/testing/tests/regression-suite/0944-REPORT-principal-property-search.result
index c756d3cc..75718840 100644
--- a/testing/tests/regression-suite/0944-REPORT-principal-property-search.result
+++ b/testing/tests/regression-suite/0944-REPORT-principal-property-search.result
@@ -1,6 +1,7 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 ETag: "4801fed73bca80f8f4b91b3d69dd2454"
 Content-Length: 649
 Content-Type: text/xml; charset="utf-8"
diff --git a/testing/tests/regression-suite/0945-ACL.result b/testing/tests/regression-suite/0945-ACL.result
index c04753d8..f8444b77 100644
--- a/testing/tests/regression-suite/0945-ACL.result
+++ b/testing/tests/regression-suite/0945-ACL.result
@@ -1,6 +1,7 @@
 HTTP/1.1 200 OK
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
 
diff --git a/testing/tests/regression-suite/0946-ACL.result b/testing/tests/regression-suite/0946-ACL.result
index 98abb753..fa580809 100644
--- a/testing/tests/regression-suite/0946-ACL.result
+++ b/testing/tests/regression-suite/0946-ACL.result
@@ -1,6 +1,7 @@
 HTTP/1.1 200 OK
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
 
diff --git a/testing/tests/regression-suite/0947-ACL.result b/testing/tests/regression-suite/0947-ACL.result
index e6939404..7cdfa29e 100644
--- a/testing/tests/regression-suite/0947-ACL.result
+++ b/testing/tests/regression-suite/0947-ACL.result
@@ -1,6 +1,7 @@
 HTTP/1.1 200 OK
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
 
diff --git a/testing/tests/regression-suite/0948-MKTICKET.result b/testing/tests/regression-suite/0948-MKTICKET.result
index 9fc6f359..c42156e8 100644
--- a/testing/tests/regression-suite/0948-MKTICKET.result
+++ b/testing/tests/regression-suite/0948-MKTICKET.result
@@ -1,9 +1,10 @@
 HTTP/1.1 200 OK
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 Ticket:Good Ticket ID
 ETag: "Some good etag"
-Content-Length: 537
+Content-Length: 504
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
@@ -18,7 +19,6 @@ Content-Type: text/xml; charset="utf-8"
     <read/>
     <read-current-user-privilege-set/>
     <C:read-free-busy/>
-    <C:schedule-query-freebusy/>
    </privilege>
    <T:timeout>Second-3600</T:timeout>
    <T:visits>infinity</T:visits>
diff --git a/testing/tests/regression-suite/0949-MKTICKET.result b/testing/tests/regression-suite/0949-MKTICKET.result
index 3ec9fcbb..43d459cc 100644
--- a/testing/tests/regression-suite/0949-MKTICKET.result
+++ b/testing/tests/regression-suite/0949-MKTICKET.result
@@ -1,13 +1,14 @@
 HTTP/1.1 400 Bad Request
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
-ETag: "567b0424ecca3303b030d882be2093ef"
-Content-Length: 86
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+ETag: "7bc3d8a76fb705dfff8a6654bb8d7fb8"
+Content-Length: 155
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
-<error xmlns="DAV:">
- <invalid-xml/>
+<error xmlns="DAV:" xmlns:T="http://www.xythos.com/namespaces/StorageServer">
+ <missing-xml-for-request/>
 </error>
 
      dav_owner_id: >3<
diff --git a/testing/tests/regression-suite/0950-MKTICKET.result b/testing/tests/regression-suite/0950-MKTICKET.result
index e2dbed5e..e974fe49 100644
--- a/testing/tests/regression-suite/0950-MKTICKET.result
+++ b/testing/tests/regression-suite/0950-MKTICKET.result
@@ -1,9 +1,10 @@
 HTTP/1.1 200 OK
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 Ticket:Good Ticket ID
 ETag: "Some good ETag"
-Content-Length: 622
+Content-Length: 589
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
@@ -23,7 +24,6 @@ Content-Type: text/xml; charset="utf-8"
     <write-content/>
     <bind/>
     <unbind/>
-    <C:schedule-query-freebusy/>
    </privilege>
    <T:timeout>Second-86400</T:timeout>
    <T:visits>infinity</T:visits>
diff --git a/testing/tests/regression-suite/0952-PROPFIND.result b/testing/tests/regression-suite/0952-PROPFIND.result
index 0486d1d1..5027225a 100644
--- a/testing/tests/regression-suite/0952-PROPFIND.result
+++ b/testing/tests/regression-suite/0952-PROPFIND.result
@@ -14,9 +14,6 @@
      <privilege>
       <C:read-free-busy/>
      </privilege>
-     <privilege>
-      <C:schedule-query-freebusy/>
-     </privilege>
     </current-user-privilege-set>
     <W:ticketdiscovery/>
    </prop>
diff --git a/testing/tests/regression-suite/0954-PROPFIND.result b/testing/tests/regression-suite/0954-PROPFIND.result
index 63049f15..4a200c01 100644
--- a/testing/tests/regression-suite/0954-PROPFIND.result
+++ b/testing/tests/regression-suite/0954-PROPFIND.result
@@ -41,30 +41,6 @@
      <privilege>
       <unbind/>
      </privilege>
-     <privilege>
-      <C:schedule-deliver/>
-     </privilege>
-     <privilege>
-      <C:schedule-deliver-invite/>
-     </privilege>
-     <privilege>
-      <C:schedule-deliver-reply/>
-     </privilege>
-     <privilege>
-      <C:schedule-query-freebusy/>
-     </privilege>
-     <privilege>
-      <C:schedule-send/>
-     </privilege>
-     <privilege>
-      <C:schedule-send-invite/>
-     </privilege>
-     <privilege>
-      <C:schedule-send-reply/>
-     </privilege>
-     <privilege>
-      <C:schedule-send-freebusy/>
-     </privilege>
     </current-user-privilege-set>
     <TKT:ticketdiscovery>
      <TKT:ticketinfo>
@@ -78,7 +54,6 @@
        <read/>
        <read-current-user-privilege-set/>
        <C:read-free-busy/>
-       <C:schedule-query-freebusy/>
       </privilege>
      </TKT:ticketinfo>
     </TKT:ticketdiscovery>
diff --git a/testing/tests/regression-suite/0955-DELTICKET.result b/testing/tests/regression-suite/0955-DELTICKET.result
index 3b278e52..4e192c1a 100644
--- a/testing/tests/regression-suite/0955-DELTICKET.result
+++ b/testing/tests/regression-suite/0955-DELTICKET.result
@@ -1,6 +1,7 @@
 HTTP/1.1 204 No Content
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
 
diff --git a/testing/tests/regression-suite/0956-PROPFIND.result b/testing/tests/regression-suite/0956-PROPFIND.result
index 669c8757..a7ce2809 100644
--- a/testing/tests/regression-suite/0956-PROPFIND.result
+++ b/testing/tests/regression-suite/0956-PROPFIND.result
@@ -14,9 +14,6 @@
      <privilege>
       <C:read-free-busy/>
      </privilege>
-     <privilege>
-      <C:schedule-query-freebusy/>
-     </privilege>
     </current-user-privilege-set>
     <W:ticketdiscovery/>
    </prop>
diff --git a/testing/tests/regression-suite/0957-MKTICKET.result b/testing/tests/regression-suite/0957-MKTICKET.result
index 40bc531b..14ba20a2 100644
--- a/testing/tests/regression-suite/0957-MKTICKET.result
+++ b/testing/tests/regression-suite/0957-MKTICKET.result
@@ -1,9 +1,10 @@
 HTTP/1.1 200 OK
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 Ticket:Good Ticket ID
 ETag: "Some good etag"
-Content-Length: 618
+Content-Length: 585
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
@@ -23,7 +24,6 @@ Content-Type: text/xml; charset="utf-8"
     <write-content/>
     <bind/>
     <unbind/>
-    <C:schedule-query-freebusy/>
    </privilege>
    <T:timeout>infinity</T:timeout>
    <T:visits>infinity</T:visits>
diff --git a/testing/tests/regression-suite/0959-REPORT-public-expanded.result b/testing/tests/regression-suite/0959-REPORT-public-expanded.result
index 7abcab9b..b7501dd5 100644
--- a/testing/tests/regression-suite/0959-REPORT-public-expanded.result
+++ b/testing/tests/regression-suite/0959-REPORT-public-expanded.result
@@ -1,6 +1,7 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 ETag: "9663419211a7a515329d8f6f104ebddd"
 Content-Length: 10631
 Content-Type: text/xml; charset="utf-8"
diff --git a/testing/tests/regression-suite/0962-BIND.result b/testing/tests/regression-suite/0962-BIND.result
index 1c7276db..dcea4d1c 100644
--- a/testing/tests/regression-suite/0962-BIND.result
+++ b/testing/tests/regression-suite/0962-BIND.result
@@ -1,6 +1,7 @@
 HTTP/1.1 201 Created
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 Location: /caldav.php/user4/user2/
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
diff --git a/testing/tests/regression-suite/0963-BIND.result b/testing/tests/regression-suite/0963-BIND.result
index bf95a875..ebb90efb 100644
--- a/testing/tests/regression-suite/0963-BIND.result
+++ b/testing/tests/regression-suite/0963-BIND.result
@@ -1,6 +1,7 @@
 HTTP/1.1 403 Forbidden
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 Content-Length: 138
 Content-Type: text/xml; charset="utf-8"
 
diff --git a/testing/tests/regression-suite/0965-PROPFIND.result b/testing/tests/regression-suite/0965-PROPFIND.result
index d83d6dcb..2743b03a 100644
--- a/testing/tests/regression-suite/0965-PROPFIND.result
+++ b/testing/tests/regression-suite/0965-PROPFIND.result
@@ -33,30 +33,6 @@
      <privilege>
       <unbind/>
      </privilege>
-     <privilege>
-      <C:schedule-deliver/>
-     </privilege>
-     <privilege>
-      <C:schedule-deliver-invite/>
-     </privilege>
-     <privilege>
-      <C:schedule-deliver-reply/>
-     </privilege>
-     <privilege>
-      <C:schedule-query-freebusy/>
-     </privilege>
-     <privilege>
-      <C:schedule-send/>
-     </privilege>
-     <privilege>
-      <C:schedule-send-invite/>
-     </privilege>
-     <privilege>
-      <C:schedule-send-reply/>
-     </privilege>
-     <privilege>
-      <C:schedule-send-freebusy/>
-     </privilege>
     </current-user-privilege-set>
    </prop>
    <status>HTTP/1.1 200 OK</status>
diff --git a/testing/tests/regression-suite/0966-REPORT-bound.result b/testing/tests/regression-suite/0966-REPORT-bound.result
index 97ac8d8e..eab5d46f 100644
--- a/testing/tests/regression-suite/0966-REPORT-bound.result
+++ b/testing/tests/regression-suite/0966-REPORT-bound.result
@@ -1,6 +1,7 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 ETag: "1906d52bec5b04408739a88cd9d6dd97"
 Content-Length: 3516
 Content-Type: text/xml; charset="utf-8"
diff --git a/testing/tests/regression-suite/0968-GET-bound.result b/testing/tests/regression-suite/0968-GET-bound.result
index 1d5b0557..85c5fe8b 100644
--- a/testing/tests/regression-suite/0968-GET-bound.result
+++ b/testing/tests/regression-suite/0968-GET-bound.result
@@ -1,6 +1,7 @@
 HTTP/1.1 200 OK
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 Etag: "f2c974ff51cb52cde0668544deb36380"
 Content-Length: 858
 Content-Type: text/calendar; charset="utf-8"
diff --git a/testing/tests/regression-suite/0970-PROPPATCH-bound.result b/testing/tests/regression-suite/0970-PROPPATCH-bound.result
index d12b1acd..8f7ab9f6 100644
--- a/testing/tests/regression-suite/0970-PROPPATCH-bound.result
+++ b/testing/tests/regression-suite/0970-PROPPATCH-bound.result
@@ -1,6 +1,7 @@
 HTTP/1.1 200 OK
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 Content-Length: 225
 Content-Type: text/xml; charset="utf-8"
 
diff --git a/testing/tests/regression-suite/0971-PROPPATCH-bound-fail.result b/testing/tests/regression-suite/0971-PROPPATCH-bound-fail.result
index b03b21d1..bd3c1353 100644
--- a/testing/tests/regression-suite/0971-PROPPATCH-bound-fail.result
+++ b/testing/tests/regression-suite/0971-PROPPATCH-bound-fail.result
@@ -1,6 +1,7 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 Content-Length: 623
 Content-Type: text/xml; charset="utf-8"
 
diff --git a/testing/tests/regression-suite/0972-BIND.result b/testing/tests/regression-suite/0972-BIND.result
index 7f6bc9e8..7af4110a 100644
--- a/testing/tests/regression-suite/0972-BIND.result
+++ b/testing/tests/regression-suite/0972-BIND.result
@@ -1,6 +1,7 @@
 HTTP/1.1 201 Created
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 Location: /caldav.php/user4/user1/
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
diff --git a/testing/tests/regression-suite/0973-PUT-bound-succeed.result b/testing/tests/regression-suite/0973-PUT-bound-succeed.result
index 477c0206..4667fa69 100644
--- a/testing/tests/regression-suite/0973-PUT-bound-succeed.result
+++ b/testing/tests/regression-suite/0973-PUT-bound-succeed.result
@@ -1,6 +1,7 @@
 HTTP/1.1 201 Created
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 ETag: "9a8d7696ee2e0a0f1f4170fe4f094a3a"
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
diff --git a/testing/tests/regression-suite/0974-PUT-bound-fail.result b/testing/tests/regression-suite/0974-PUT-bound-fail.result
index cae661d4..72f76268 100644
--- a/testing/tests/regression-suite/0974-PUT-bound-fail.result
+++ b/testing/tests/regression-suite/0974-PUT-bound-fail.result
@@ -1,6 +1,7 @@
 HTTP/1.1 403 Forbidden
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
 
diff --git a/testing/tests/regression-suite/0980-MKCOL-base.result b/testing/tests/regression-suite/0980-MKCOL-base.result
index 670fb48b..0a17b80e 100644
--- a/testing/tests/regression-suite/0980-MKCOL-base.result
+++ b/testing/tests/regression-suite/0980-MKCOL-base.result
@@ -1,6 +1,7 @@
 HTTP/1.1 201 Created
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 Cache-Control: no-cache
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
diff --git a/testing/tests/regression-suite/0981-MKCOL-subcal.result b/testing/tests/regression-suite/0981-MKCOL-subcal.result
index d3db30ea..1528b46a 100644
--- a/testing/tests/regression-suite/0981-MKCOL-subcal.result
+++ b/testing/tests/regression-suite/0981-MKCOL-subcal.result
@@ -1,6 +1,7 @@
 HTTP/1.1 201 Created
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 Cache-Control: no-cache
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
diff --git a/testing/tests/regression-suite/0982-BIND.result b/testing/tests/regression-suite/0982-BIND.result
index a00b7d04..525cc9e4 100644
--- a/testing/tests/regression-suite/0982-BIND.result
+++ b/testing/tests/regression-suite/0982-BIND.result
@@ -1,6 +1,7 @@
 HTTP/1.1 201 Created
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 Location: /caldav.php/user4/base/user1/
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
diff --git a/testing/tests/regression-suite/0983-BIND.result b/testing/tests/regression-suite/0983-BIND.result
index 18f8016d..ef9543c0 100644
--- a/testing/tests/regression-suite/0983-BIND.result
+++ b/testing/tests/regression-suite/0983-BIND.result
@@ -1,6 +1,7 @@
 HTTP/1.1 201 Created
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 Location: /caldav.php/user4/base/user2/
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
diff --git a/testing/tests/regression-suite/0984-BIND.result b/testing/tests/regression-suite/0984-BIND.result
index 934e1f77..e8924d53 100644
--- a/testing/tests/regression-suite/0984-BIND.result
+++ b/testing/tests/regression-suite/0984-BIND.result
@@ -1,6 +1,7 @@
 HTTP/1.1 403 Forbidden
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 Content-Length: 138
 Content-Type: text/xml; charset="utf-8"
 
diff --git a/testing/tests/regression-suite/0986-PUT-bound-succeed.result b/testing/tests/regression-suite/0986-PUT-bound-succeed.result
index d3f134bc..aa9a035d 100644
--- a/testing/tests/regression-suite/0986-PUT-bound-succeed.result
+++ b/testing/tests/regression-suite/0986-PUT-bound-succeed.result
@@ -1,6 +1,7 @@
 HTTP/1.1 201 Created
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 ETag: "1c7895f11787e71fd6dbe3260d72d4a0"
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
diff --git a/testing/tests/regression-suite/0989-PUT-subcalendar.result b/testing/tests/regression-suite/0989-PUT-subcalendar.result
index 08c0d587..48d83fc1 100644
--- a/testing/tests/regression-suite/0989-PUT-subcalendar.result
+++ b/testing/tests/regression-suite/0989-PUT-subcalendar.result
@@ -1,6 +1,7 @@
 HTTP/1.1 201 Created
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 ETag: "baad41c9f24bd1ecbdde6e58882df9b7"
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
diff --git a/testing/tests/regression-suite/0990-PUT-whole-subcalendar.result b/testing/tests/regression-suite/0990-PUT-whole-subcalendar.result
index 9932028b..bca47d17 100644
--- a/testing/tests/regression-suite/0990-PUT-whole-subcalendar.result
+++ b/testing/tests/regression-suite/0990-PUT-whole-subcalendar.result
@@ -2,7 +2,8 @@ HTTP/1.1 100 Continue
 
 HTTP/1.1 200 OK
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
 
diff --git a/testing/tests/regression-suite/0991-MKTICKET-admin.result b/testing/tests/regression-suite/0991-MKTICKET-admin.result
index 00068024..b17f7010 100644
--- a/testing/tests/regression-suite/0991-MKTICKET-admin.result
+++ b/testing/tests/regression-suite/0991-MKTICKET-admin.result
@@ -1,9 +1,10 @@
 HTTP/1.1 200 OK
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 Ticket:Good Ticket ID
 ETag: "Some good etag"
-Content-Length: 618
+Content-Length: 585
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
@@ -23,7 +24,6 @@ Content-Type: text/xml; charset="utf-8"
     <write-content/>
     <bind/>
     <unbind/>
-    <C:schedule-query-freebusy/>
    </privilege>
    <T:timeout>infinity</T:timeout>
    <T:visits>infinity</T:visits>
diff --git a/testing/tests/regression-suite/0992-BIND-admin.result b/testing/tests/regression-suite/0992-BIND-admin.result
index 4dadf5ef..990c4c2c 100644
--- a/testing/tests/regression-suite/0992-BIND-admin.result
+++ b/testing/tests/regression-suite/0992-BIND-admin.result
@@ -1,6 +1,7 @@
 HTTP/1.1 201 Created
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 Location: /caldav.php/user4/base/user3/
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
diff --git a/testing/tests/regression-suite/0993-PROPPATCH-admin-bound.result b/testing/tests/regression-suite/0993-PROPPATCH-admin-bound.result
index ddddb637..3579de1f 100644
--- a/testing/tests/regression-suite/0993-PROPPATCH-admin-bound.result
+++ b/testing/tests/regression-suite/0993-PROPPATCH-admin-bound.result
@@ -1,6 +1,7 @@
 HTTP/1.1 200 OK
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 Content-Length: 230
 Content-Type: text/xml; charset="utf-8"
 
diff --git a/testing/tests/regression-suite/0994-DELETE-admin-bind.result b/testing/tests/regression-suite/0994-DELETE-admin-bind.result
index 8b8343c0..374b37ec 100644
--- a/testing/tests/regression-suite/0994-DELETE-admin-bind.result
+++ b/testing/tests/regression-suite/0994-DELETE-admin-bind.result
@@ -1,6 +1,7 @@
 HTTP/1.1 204 No Content
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
 
diff --git a/testing/tests/regression-suite/0995-GET-mashup.result b/testing/tests/regression-suite/0995-GET-mashup.result
index a32d75eb..e76e1426 100644
--- a/testing/tests/regression-suite/0995-GET-mashup.result
+++ b/testing/tests/regression-suite/0995-GET-mashup.result
@@ -1,6 +1,7 @@
 HTTP/1.1 200 OK
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
 Content-Length: 18996
 Etag: "ae93907cb03bc025b8e733eb61f3a09e"
 Content-Type: text/calendar; charset="utf-8"