3 files changed, 11 insertions, 13 deletions
diff --git a/config-model/src/main/resources/schema/admin.rnc b/config-model/src/main/resources/schema/admin.rnc
index cdf26807bcb..b7ec252c4d7 100644
--- a/config-model/src/main/resources/schema/admin.rnc
+++ b/config-model/src/main/resources/schema/admin.rnc
@@ -5,7 +5,6 @@ AdminV2 =
  element admin {
    attribute version { "2.0" } &
    element adminserver { service.attlist } &
-   element minSlobroksPerCluster { xsd:positiveInteger }? & # TODO: Remove when no applications use this
    GenericConfig* &
    LogServer? &
    (ConfigServer | ConfigServers)? &
@@ -20,7 +19,6 @@ AdminV2 =
 AdminV3 =
   element admin {
     attribute version { "3.0"  } &
-    element minSlobroksPerCluster { xsd:positiveInteger }? & # TODO: Remove when no applications use this
     GenericConfig* &
     Nodes
   }
@@ -28,7 +26,6 @@ AdminV3 =
 AdminV4 =
   element admin {
     attribute version { "4.0"  } &
-    element minSlobroksPerCluster { xsd:positiveInteger }? & # TODO: Remove when no applications use this
     AdminV4Slobroks? &
     AdminV4LogServers? &
     GenericConfig* &
@@ -83,7 +80,8 @@ LogServer = element logserver {
 
 FileDistribution = element filedistribution {
    element uploadbitrate { xsd:string {   pattern = "\d+(\.\d*)?\s*[kmgKMG]?" } }? &
-   element downloadbitrate { xsd:string { pattern = "\d+(\.\d*)?\s*[kmgKMG]?" } }?
+   element downloadbitrate { xsd:string { pattern = "\d+(\.\d*)?\s*[kmgKMG]?" } }? &
+   element disabled { xsd:boolean }? # Nov. 2017: Temporary, should not be documented
 }
 
 Metrics = element metrics {
diff --git a/config-model/src/main/resources/schema/containercluster.rnc b/config-model/src/main/resources/schema/containercluster.rnc
index af9b89b8553..6a90bef7bb2 100644
--- a/config-model/src/main/resources/schema/containercluster.rnc
+++ b/config-model/src/main/resources/schema/containercluster.rnc
@@ -7,8 +7,7 @@ ContainerCluster = element container | jdisc {
     ContainerServices &    
     DocumentBinding* &
     Aliases? &
-    NodesOfContainerCluster? &
-    Identity?
+    NodesOfContainerCluster?
 }
 
 ContainerServices =
@@ -62,6 +61,7 @@ Filtering = element filtering {
 HttpServer =  element server {
     attribute port { xsd:nonNegativeInteger } &
     ComponentId &
+    element ssl-keystore-configurator { BundleSpec }? & # FOR INTERNAL USE ONLY - SUBJECT TO CHANGE
     GenericConfig*
 }
 
@@ -225,8 +225,3 @@ DocumentBinding = element document {
     attribute class { xsd:NCName } &
     attribute bundle { xsd:NCName }
 }
-
-Identity = element identity {
-   element domain { xsd:NCName } &
-   element service { xsd:NCName }
-}
diff --git a/config-model/src/main/resources/schema/deployment.rnc b/config-model/src/main/resources/schema/deployment.rnc
index 90bff8e31b3..2ecfa781876 100644
--- a/config-model/src/main/resources/schema/deployment.rnc
+++ b/config-model/src/main/resources/schema/deployment.rnc
@@ -4,6 +4,8 @@
 
 start = element deployment {
    attribute version { "1.0" } &
+   attribute athenz-domain { xsd:string }? &
+   attribute athenz-service { xsd:string }? &
    Upgrade? &
    BlockChange* &
    Test? &
@@ -31,15 +33,18 @@ BlockUpgrade = element block-upgrade { # Legacy name - remove on Vespa 7
 }
 
 Test = element test {
-    text
+   attribute athenz-service { xsd:string }? &
+   text
 }
 
 Staging = element staging {
-    text
+   attribute athenz-service { xsd:string }? &
+   text
 }
 
 Prod = element prod {
    attribute global-service-id { text }? &
+   attribute athenz-service { xsd:string }? &
    Region* &
    Delay* &
    Parallel*