Switch virtual labs to Salt 2017.7

Change-Id: I2c08014f08cc08ed3cd869adc186974f11c6d313
diff --git a/classes/cluster/virtual-mcp-mitaka-dvr-trusty/infra/config.yml b/classes/cluster/virtual-mcp-mitaka-dvr-trusty/infra/config.yml
index ffedd46..5958964 100644
--- a/classes/cluster/virtual-mcp-mitaka-dvr-trusty/infra/config.yml
+++ b/classes/cluster/virtual-mcp-mitaka-dvr-trusty/infra/config.yml
@@ -1,7 +1,7 @@
 classes:
 - service.git.client
 - system.linux.system.single
-- system.linux.system.repo.mcp.salt
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.linux.system.repo.mcp.apt_mirantis.openstack
 - system.openssh.client.lab
 - system.salt.master.pkg
diff --git a/classes/cluster/virtual-mcp-mitaka-dvr-trusty/stacklight/server.yml b/classes/cluster/virtual-mcp-mitaka-dvr-trusty/stacklight/server.yml
index bb9e88b..143b0d6 100644
--- a/classes/cluster/virtual-mcp-mitaka-dvr-trusty/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp-mitaka-dvr-trusty/stacklight/server.yml
@@ -1,9 +1,9 @@
 classes:
 - system.docker.host
 - system.linux.system.repo.influxdb
-- system.linux.system.repo.mcp.salt
 - system.linux.system.repo.mcp.apt_mirantis.elastic.5x
 - system.linux.system.repo.mcp.apt_mirantis.kibana.5x
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.linux.system.repo.docker
 - system.elasticsearch.server.cluster
 - system.elasticsearch.server.curator