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

diff --cc Gemfile.lock
index 51eb802fa9ca89b351efbde24cb7df04c4bf1bbf,e7ad89df1df15a96c6d7895f6ffd4c85d656aac2..a52523317df64eeb8de61a417da5a8e9260f8110
--- 1/Gemfile.lock
--- 2/Gemfile.lock
+++ b/Gemfile.lock
@@@ -4,9 -4,9 +4,9 @@@ GE
      ast (2.4.2)
      bcrypt_pbkdf (1.1.0)
      builder (3.2.4)
 -    chef-utils (16.10.17)
 +    chef-utils (16.11.7)
-     cookstyle (7.9.0)
-       rubocop (= 1.11.0)
+     cookstyle (7.10.0)
+       rubocop (= 1.12.0)
      diff-lcs (1.4.4)
      docker-api (2.0.0)
        excon (>= 0.47.0)