Merge remote-tracking branch 'github/pull/559'

diff --combined Gemfile.lock
index 81b3a819bc5c4e23ab22f91dd927b5c628089c35,e8b1663b20ec596b0a99eacd25fc674818a5cd0a..4c2e08abd5407a9e65904b7a47e5a56584157a75
--- 1/Gemfile.lock
--- 2/Gemfile.lock
+++ b/Gemfile.lock
@@@ -23,7 -23,7 +23,7 @@@ GE
        builder (>= 2.1.2)
        rexml (~> 3.0)
      httpclient (2.8.3)
 -    kitchen-dokken (2.18.0)
 +    kitchen-dokken (2.19.0)
        docker-api (>= 1.33, < 3)
        lockfile (~> 2.1)
        test-kitchen (>= 1.15, < 4)
@@@ -60,22 -60,22 +60,22 @@@
      rainbow (3.1.1)
      regexp_parser (2.6.0)
      rexml (3.2.5)
-     rspec (3.11.0)
-       rspec-core (~> 3.11.0)
-       rspec-expectations (~> 3.11.0)
-       rspec-mocks (~> 3.11.0)
-     rspec-core (3.11.0)
-       rspec-support (~> 3.11.0)
-     rspec-expectations (3.11.1)
+     rspec (3.12.0)
+       rspec-core (~> 3.12.0)
+       rspec-expectations (~> 3.12.0)
+       rspec-mocks (~> 3.12.0)
+     rspec-core (3.12.0)
+       rspec-support (~> 3.12.0)
+     rspec-expectations (3.12.1)
        diff-lcs (>= 1.2.0, < 2.0)
-       rspec-support (~> 3.11.0)
+       rspec-support (~> 3.12.0)
      rspec-its (1.3.0)
        rspec-core (>= 3.0.0)
        rspec-expectations (>= 3.0.0)
-     rspec-mocks (3.11.1)
+     rspec-mocks (3.12.1)
        diff-lcs (>= 1.2.0, < 2.0)
-       rspec-support (~> 3.11.0)
-     rspec-support (3.11.1)
+       rspec-support (~> 3.12.0)
+     rspec-support (3.12.0)
      rubocop (1.25.1)
        parallel (~> 1.10)
        parser (>= 3.1.0.0)
@@@ -90,13 -90,13 +90,13 @@@
      ruby-progressbar (1.11.0)
      rubyntlm (0.6.3)
      rubyzip (2.3.2)
-     serverspec (2.42.0)
+     serverspec (2.42.1)
        multi_json
        rspec (~> 3.0)
        rspec-its
        specinfra (~> 2.72)
      sfl (2.3)
-     specinfra (2.83.3)
+     specinfra (2.84.0)
        net-scp
        net-ssh (>= 2.7)
        net-telnet (= 0.1.1)