Fix: rubocop
Merge branch 'master' into stable-chef-11.10