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

diff --combined Gemfile.lock
index 2a7f86a7ee35d94207f5efe675bdd0decd042873,9c2665c1d99783d9d6ce88c226ea6a4e12a5cbca..e2c31037decfd31c61a614f77c0d71e62b14e1f9
--- 1/Gemfile.lock
--- 2/Gemfile.lock
+++ b/Gemfile.lock
@@@ -7,8 -7,8 +7,8 @@@ GE
      chef-utils (17.2.29)
        concurrent-ruby
      concurrent-ruby (1.1.9)
 -    cookstyle (7.13.0)
 -      rubocop (= 1.15.0)
 +    cookstyle (7.14.2)
 +      rubocop (= 1.17.0)
      diff-lcs (1.4.4)
      docker-api (2.1.0)
        excon (>= 0.47.0)
@@@ -75,21 -75,21 +75,21 @@@
        diff-lcs (>= 1.2.0, < 2.0)
        rspec-support (~> 3.10.0)
      rspec-support (3.10.2)
 -    rubocop (1.15.0)
 +    rubocop (1.17.0)
        parallel (~> 1.10)
        parser (>= 3.0.0.0)
        rainbow (>= 2.2.2, < 4.0)
        regexp_parser (>= 1.8, < 3.0)
        rexml
 -      rubocop-ast (>= 1.5.0, < 2.0)
 +      rubocop-ast (>= 1.7.0, < 2.0)
        ruby-progressbar (~> 1.7)
        unicode-display_width (>= 1.4.0, < 3.0)
 -    rubocop-ast (1.6.0)
 +    rubocop-ast (1.7.0)
        parser (>= 3.0.1.1)
      ruby-progressbar (1.11.0)
      rubyntlm (0.6.3)
      rubyzip (2.3.0)
-     serverspec (2.41.7)
+     serverspec (2.41.8)
        multi_json
        rspec (~> 3.0)
        rspec-its