Remove Salt deprecations and switch tests to Salt 2017.7

Change-Id: Iaf58a1321ddbd6ed1b991cf57446e4eef9c2991f
diff --git a/.travis.yml b/.travis.yml
index 59bf317..61d7fd6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,10 +17,15 @@
   - bundle install
 
 env:
+  - PLATFORM=trevorj/salty-whales:trusty-2017.7 SUITE=rabbitmq-server
+  - PLATFORM=trevorj/salty-whales:xenial-2017.7 SUITE=rabbitmq-server
+#  - PLATFORM=trevorj/salty-whales:trusty-2017.7 SUITE=rabbitmq-ssl-server
+#  - PLATFORM=trevorj/salty-whales:xenial-2017.7 SUITE=rabbitmq-ssl-server
   - PLATFORM=trevorj/salty-whales:trusty SUITE=rabbitmq-server
   - PLATFORM=trevorj/salty-whales:xenial SUITE=rabbitmq-server
 #  - PLATFORM=trevorj/salty-whales:trusty SUITE=rabbitmq-ssl-server
 #  - PLATFORM=trevorj/salty-whales:xenial SUITE=rabbitmq-ssl-server
+## Test on both Salt version until there is new test policy accepted
 
 before_script:
   - set -o pipefail