diff --git a/classes/cluster/k8s-ha-calico-flannel-virtlet/kubernetes/init.yml b/classes/cluster/k8s-ha-calico-flannel-virtlet/kubernetes/init.yml
index dbdee24..c5d82dc 100644
--- a/classes/cluster/k8s-ha-calico-flannel-virtlet/kubernetes/init.yml
+++ b/classes/cluster/k8s-ha-calico-flannel-virtlet/kubernetes/init.yml
@@ -26,8 +26,8 @@
     kubernetes_calico_cni_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/cni:latest
     kubernetes_calico_policy_image: calico/kube-policy-controller:v0.5.4
 
-    kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.8.13-11
-    kubernetes_pause_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/pause-amd64:v1.8.13-11
+    kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.10.3-3
+    kubernetes_pause_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/pause-amd64:v1.10.3-3
     kubernetes_virtlet_image: mirantis/virtlet:v1.0.3
     kubernetes_criproxy_version: v0.11.0
     kubernetes_criproxy_checksum: md5=115bbb0c27518db6b0b3bc8cdc5fc897
diff --git a/classes/cluster/k8s-ha-contrail-40/kubernetes/control.yml b/classes/cluster/k8s-ha-contrail-40/kubernetes/control.yml
index c556728..a408bbf 100644
--- a/classes/cluster/k8s-ha-contrail-40/kubernetes/control.yml
+++ b/classes/cluster/k8s-ha-contrail-40/kubernetes/control.yml
@@ -1,7 +1,6 @@
 classes:
 - service.etcd.server.cluster
 - service.kubernetes.control.cluster
-- service.kubernetes.control.cluster-admin
 - system.haproxy.proxy.listen.kubernetes.apiserver
 - system.linux.system.repo.docker_legacy
 - system.kubernetes.pool.cluster
@@ -9,6 +8,7 @@
 - system.salt.minion.cert.etcd_client
 - system.salt.minion.cert.etcd_server
 - system.kubernetes.master.cluster
+- system.kubernetes.control.roles.cluster-admin
 - cluster.k8s-ha-contrail-40.infra
 - cluster.overrides
 parameters:
diff --git a/classes/cluster/k8s-ha-contrail-40/opencontrail/compute.yml b/classes/cluster/k8s-ha-contrail-40/opencontrail/compute.yml
index 4122fff..913d24a 100644
--- a/classes/cluster/k8s-ha-contrail-40/opencontrail/compute.yml
+++ b/classes/cluster/k8s-ha-contrail-40/opencontrail/compute.yml
@@ -1,6 +1,8 @@
 classes:
 - system.linux.system.repo.mcp.contrail
 - system.opencontrail.compute.cluster4_0
+- system.opencontrail.client.cluster
+- system.opencontrail.client.resource.virtual_router
 - cluster.k8s-ha-contrail-40.infra
 - cluster.k8s-ha-contrail-40.opencontrail
 - cluster.overrides
@@ -21,6 +23,9 @@
       network:
         engine: k8s
         host: none
+    client:
+      identity:
+        engine: none
 
   kubernetes:
     pool:
diff --git a/classes/cluster/virtual-mcp-mitaka-dvr-trusty/openstack/proxy.yml b/classes/cluster/virtual-mcp-mitaka-dvr-trusty/openstack/proxy.yml
index 5175695..d4feb00 100644
--- a/classes/cluster/virtual-mcp-mitaka-dvr-trusty/openstack/proxy.yml
+++ b/classes/cluster/virtual-mcp-mitaka-dvr-trusty/openstack/proxy.yml
@@ -20,3 +20,6 @@
           redirect:
             protocol: https
             host: $host
+        nginx_proxy_openstack_web:
+          proxy:
+            request_buffer: true
diff --git a/classes/cluster/virtual-mcp-mitaka-ovs-trusty/openstack/proxy.yml b/classes/cluster/virtual-mcp-mitaka-ovs-trusty/openstack/proxy.yml
index 761df7c..8a9f9ad 100644
--- a/classes/cluster/virtual-mcp-mitaka-ovs-trusty/openstack/proxy.yml
+++ b/classes/cluster/virtual-mcp-mitaka-ovs-trusty/openstack/proxy.yml
@@ -20,3 +20,6 @@
           redirect:
             protocol: https
             host: $host
+        nginx_proxy_openstack_web:
+          proxy:
+            request_buffer: true
diff --git a/classes/cluster/virtual-mcp-pike-dvr/infra/backup/client_common.yml b/classes/cluster/virtual-mcp-pike-dvr/infra/backup/client_common.yml
index 79b8f6b..1950686 100644
--- a/classes/cluster/virtual-mcp-pike-dvr/infra/backup/client_common.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr/infra/backup/client_common.yml
@@ -36,5 +36,6 @@
   backupninja:
     client:
       target:
+        # WR PROD-20679 - set the same path for client and server
         home_dir: /srv/volumes/backup/backupninja
         engine_opts: "-av --delete --recursive --safe-links"
diff --git a/classes/cluster/virtual-mcp-pike-dvr/infra/backup/server.yml b/classes/cluster/virtual-mcp-pike-dvr/infra/backup/server.yml
index 2d6d77f..8f84903 100644
--- a/classes/cluster/virtual-mcp-pike-dvr/infra/backup/server.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr/infra/backup/server.yml
@@ -9,7 +9,7 @@
     xtrabackup_public_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDEvr+tWAJ62wROllpSZeaSPxxnVY3R65sfUW8wM6L8tr1knJOTQLoBikmcjISb3ekyPlwubTypGoxb7al06FiNwfr3KDkytflKRGTyMKYgchighuFCfBuePd13cjf1l19TYU7u7a+VuCVWi7pmhDGUkMi24s23OroQb7D14XX17v46wLrqJQi2nrXzN/DWXcn/ycq8IZ7ZFgN/uYlbpfAKX8PCvImbDDO8+BgndAy4MPz8cWOWsnfGMVNePhvhazVcijLvx8Vu2Iuvg7CoJiSGjTe7YTms44/WpnFkHreyK8cwsw4wzls4BApu6UU2jIAsAMZh9zux/Rtni71dcNfF
   backupninja:
     server:
-      home_dir: /srv/glusterfs/backup/backupninja
+      home_dir: /srv/volumes/backup/backupninja
   xtrabackup:
     server:
-      backup_dir: /srv/glusterfs/backup/xtrabackup
\ No newline at end of file
+      backup_dir: /srv/volumes/backup/xtrabackup
\ No newline at end of file
diff --git a/classes/cluster/virtual-mcp-pike-dvr/infra/config.yml b/classes/cluster/virtual-mcp-pike-dvr/infra/config.yml
index 5905d47..a8e6d17 100644
--- a/classes/cluster/virtual-mcp-pike-dvr/infra/config.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr/infra/config.yml
@@ -58,11 +58,21 @@
   salt:
     master:
       backup: true
+      initial_data:
+        engine: backupninja
+        source: ctl03
+        home_dir: /srv/volumes/backup/backupninja
+        host: cfg01.virtual-mcp-pike-dvr.local
       reactor:
         reclass/minion/classify:
         - salt://reclass/reactor/node_register.sls
     minion:
       backup: true
+      initial_data:
+        engine: backupninja
+        source: ctl03
+        home_dir: /srv/volumes/backup/backupninja
+        host: cfg01.virtual-mcp-pike-dvr.local
   reclass:
     storage:
       class_mapping:
diff --git a/classes/cluster/virtual-mcp-pike-ovs/infra/backup/client_common.yml b/classes/cluster/virtual-mcp-pike-ovs/infra/backup/client_common.yml
index 79b8f6b..1950686 100644
--- a/classes/cluster/virtual-mcp-pike-ovs/infra/backup/client_common.yml
+++ b/classes/cluster/virtual-mcp-pike-ovs/infra/backup/client_common.yml
@@ -36,5 +36,6 @@
   backupninja:
     client:
       target:
+        # WR PROD-20679 - set the same path for client and server
         home_dir: /srv/volumes/backup/backupninja
         engine_opts: "-av --delete --recursive --safe-links"
diff --git a/classes/cluster/virtual-mcp-pike-ovs/infra/backup/server.yml b/classes/cluster/virtual-mcp-pike-ovs/infra/backup/server.yml
index 2d6d77f..8f84903 100644
--- a/classes/cluster/virtual-mcp-pike-ovs/infra/backup/server.yml
+++ b/classes/cluster/virtual-mcp-pike-ovs/infra/backup/server.yml
@@ -9,7 +9,7 @@
     xtrabackup_public_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDEvr+tWAJ62wROllpSZeaSPxxnVY3R65sfUW8wM6L8tr1knJOTQLoBikmcjISb3ekyPlwubTypGoxb7al06FiNwfr3KDkytflKRGTyMKYgchighuFCfBuePd13cjf1l19TYU7u7a+VuCVWi7pmhDGUkMi24s23OroQb7D14XX17v46wLrqJQi2nrXzN/DWXcn/ycq8IZ7ZFgN/uYlbpfAKX8PCvImbDDO8+BgndAy4MPz8cWOWsnfGMVNePhvhazVcijLvx8Vu2Iuvg7CoJiSGjTe7YTms44/WpnFkHreyK8cwsw4wzls4BApu6UU2jIAsAMZh9zux/Rtni71dcNfF
   backupninja:
     server:
-      home_dir: /srv/glusterfs/backup/backupninja
+      home_dir: /srv/volumes/backup/backupninja
   xtrabackup:
     server:
-      backup_dir: /srv/glusterfs/backup/xtrabackup
\ No newline at end of file
+      backup_dir: /srv/volumes/backup/xtrabackup
\ No newline at end of file
diff --git a/classes/cluster/virtual-mcp-pike-ovs/infra/config.yml b/classes/cluster/virtual-mcp-pike-ovs/infra/config.yml
index 815e20f..f3d1886 100644
--- a/classes/cluster/virtual-mcp-pike-ovs/infra/config.yml
+++ b/classes/cluster/virtual-mcp-pike-ovs/infra/config.yml
@@ -57,11 +57,21 @@
   salt:
     master:
       backup: true
+      initial_data:
+        engine: backupninja
+        source: ctl03
+        home_dir: /srv/volumes/backup/backupninja
+        host: cfg01.virtual-mcp-pike-ovs.local
       reactor:
         reclass/minion/classify:
         - salt://reclass/reactor/node_register.sls
     minion:
       backup: true
+      initial_data:
+        engine: backupninja
+        source: ctl03
+        home_dir: /srv/volumes/backup/backupninja
+        host: cfg01.virtual-mcp-pike-ovs.local
   reclass:
     storage:
       class_mapping: