[OC-3564] move core Chef to the repo root \o/ \m/

The opscode/chef repository now only contains the core Chef library code
used by chef-client, knife and chef-solo!

991 files changed, 47 insertions, 442 deletions

diff --git a/.gitattributes b/.gitattributes
index 68f32f5d66..bb9914a8b6 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,11 +1,6 @@
 # git config merge.ignore.name 'ignore changes merge driver'
 # git config merge.ignore.driver 'touch %A'
-chef/distro/common/html/* merge=ignore
-chef/distro/common/man/man1/* merge=ignore
-chef/distro/common/man/man8/* merge=ignore
-chef/lib/chef/version.rb merge=ignore
-chef-solr/lib/chef/solr/version.rb merge=ignore
-chef-server/lib/chef-server/version.rb merge=ignore
-chef-server-webui/lib/chef-server-webui/version.rb merge=ignore
-chef-server-api/lib/chef-server-api/version.rb merge=ignore
-chef-expander/lib/chef/expander/version.rb merge=ignore
+distro/common/html/* merge=ignore
+distro/common/man/man1/* merge=ignore
+distro/common/man/man8/* merge=ignore
+lib/chef/version.rb merge=ignore
diff --git a/.gitignore b/.gitignore
index 82b8f311cc..3b7e1a9f64 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,43 +2,13 @@
 coverage
 doc
 .DS_Store
-packages/chef-server/db
-examples/search_index
-examples/store
-examples/openid-cstore
-examples/openid-db
-chef/pkg
-chef-server/pkg
-chef-server-webui/pkg
-chef-server-api/pkg
-chef-expander/pkg
-chef/log
-chef/rdoc
-chef-server/log
-log
-couchdb.stderr
-couchdb.stdout
-features/data/tmp/**
-*.swp
-*.swo
-features/data/cookbooks/**/metadata.json
-features/data/solr/**
-erl_crash.dump
-*.rake_tasks~
-.idea
-features/data/repo/checksums/
-*.rbc
-chef-expander/conf/chef-expander.rb
-chef-expander/spec/fixtures/expander.log
-features/data/cookbooks/transfer_remote_files/metadata.json
-features/data/cookbooks/synchronize_deps/metadata.json
-features/data/cookbooks_not_uploaded_at_feature_start/*/metadata.json
-
+pkg
 */tags
 *~
 
 # you should check in your Gemfile.lock in applications, and not in gems
 Gemfile.lock
+Gemfile.local
 
 # Do not check in the .bundle directory, or any of the files inside it. Those files are specific to each particular machine, and are used to persist installation options between runs of the bundle install command.
 .bundle
diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index e0f7431c5e..0000000000
--- a/.gitmodules
+++ /dev/null
@@ -1,6 +0,0 @@
-[submodule "chef-server-slice/public/javascripts/jsoneditor"]
-	path = chef-server-slice/public/javascripts/jsoneditor
-	url = git://github.com/iterationlabs/jsoneditor.git
-[submodule "chef-server-slice/public/web-app-theme"]
-	path = chef-server-slice/public/web-app-theme
-	url = git://github.com/pilu/web-app-theme.git
diff --git a/chef/.rspec b/.rspec
index 7bfa3f20e6..7bfa3f20e6 100644
--- a/chef/.rspec
+++ b/.rspec
diff --git a/chef/Gemfile b/Gemfile
index 40868b9677..40868b9677 100644
--- a/chef/Gemfile
+++ b/Gemfile
diff --git a/chef/History.txt b/History.txt
index 0f94a417f2..0f94a417f2 100644
--- a/chef/History.txt
+++ b/History.txt
diff --git a/chef/Manifest.txt b/Manifest.txt
index 71ade63b44..71ade63b44 100644
--- a/chef/Manifest.txt
+++ b/Manifest.txt
diff --git a/README.rdoc b/README.rdoc
index 22e5a55856..4a1801643c 100644
--- a/README.rdoc
+++ b/README.rdoc
@@ -1,8 +1,8 @@
-= Chef[http://www.opscode.com/chef]
+= Chef
 
-= DESCRIPTION:
+== DESCRIPTION:
 
-Chef is a system integration framework designed to bring the benefits of configuration management to your entire infrastructure.
+Chef is a configuration management tool designed to bring automation to your entire infrastructure.
 
 The Chef Wiki is the definitive source of user documentation.
 
@@ -12,114 +12,71 @@ This README focuses on developers who want to modify Chef source code. For users
 
 * http://wiki.opscode.com/display/chef/Installing+Chef+from+HEAD
 
-= DEVELOPMENT:
+== DEVELOPMENT:
 
 Before working on the code, if you plan to contribute your changes, you need to read the Opscode Contributing document.
 
-* http://wiki.opscode.com/display/chef/How+to+Contribute
+* http://wiki.opscode.com/display/opscode/Contributing
 
 You will also need to set up the repository with the appropriate branches. We document the process on the Chef Wiki.
 
 * http://wiki.opscode.com/display/opscode/Working+with+Git
 
-Once your repository is set up, you can start working on the code. We do use BDD/TDD with RSpec and Cucumber, so you'll need to get a development environment running.
+Once your repository is set up, you can start working on the code. We do use TDD with RSpec, so you'll need to get a development environment running.
 
-= ENVIRONMENT:
+== REQUIREMENTS:
 
-Chef has two kinds of code testing:
+Ruby 1.8.7+ [1]
 
-* Unit Tests (rspec)
-* Integration Tests (cucumber)
+[1] As of 2012-05-25 Ruby 1.8.6 should still work, except for CHEF-2329.
 
-We're going to set up the local environment in two phases, one for each of these.
+== ENVIRONMENT:
 
-== Unit Tests (rspec):
+In order to have a development environment where changes to the Chef code can be tested, we'll need to install a few things after setting up the Git repository.
 
-We use Rspec to test that the code does what it is supposed to (unit tests).
+=== Non-Gem Dependencies
 
-Non-Ruby software:
+Install these via your platform's preferred method; for example apt, yum, ports, emerge, etc.
 
-* Gecode (version 3.5.0)
+* Git[http://git-scm.com/]
+* GCC and C Standard Libraries, header files, etc. (i.e., build-essential on debian/ubuntu)
+* Ruby development package
 
-Gecode is available on Mac OS X from homebrew, for Ubuntu/Debian from apt.opscode.com, or can be compiled from source.
+=== Runtime Rubygem Dependencies
+==== Chef Client and Solo
+* ohai
+* erubis
+* highline
+* json (1.4.4 - 1.4.6)
+* mixlib-authentication
+* mixlib-cli
+* mixlib-config
+* mixlib-log
+* moneta
+* rest-client
+* uuidtools
+* merb-core
+* net-ssh
+* fog
 
-* http://www.gecode.org/
+=== Development Rubygem Dependencies
+* rake[http://rake.rubyforge.org/]
+* rspec[http://rspec.info/]
 
-Install the Chef Gems from source in this repository.
+Ohai is also by Opscode and available on GitHub, http://github.com/opscode/ohai/tree/master.
 
-  rake install
+== Spec testing:
 
-Install the following RubyGems:
-
-* rake
-* rspec (2.8.0)
-* dep_selector (requires Gecode to compile native extensions)
-
-Run rake or rake spec:
+We use RSpec for unit/spec tests. It is not necessary to start the development
+environment to run the specs--they are completely standalone.
 
   rake spec
-  ....
-  Finished in 17.42 seconds
-  3823 examples, 0 failures, 3 pending
-
-== Integration Tests (cucumber):
-
-The integration tests require some additional software on top of what was installed for the unit tests. Most of the integration tests are for testing the Chef Server API interactions, so a Chef Server environment needs to be installed.
-
-Non-Ruby software:
-
-* Java
-* CouchDB (0.10+)
-* RabbitMQ (1.7.2+)
-
-These are available in most common distribution packaging systems, including Debian 6.0+ and Ubuntu 10.04+. Java is installed on Mac OS X by default; CouchDB and RabbitMQ are available in homebrew.
-
-Make sure the RubyGems for the Chef Server are installed (should be from the +rake install+ earlier):
-
-* chef-expander (now in its own repository at https://github.com/opscode/chef-expander)
-* chef-server
-* chef-server-api
-* chef-server-webui (now in its own repository at https://github.com/opscode/chef-server-webui)
-* chef-solr (now in its own repository at https://github.com/opscode/chef-solr)
-
-=== Starting the Environment:
-
-Once everything is installed, run the dev:features rake task. Since the features do integration testing, root access may be required.
-
-  (sudo) rake dev:features
-
-This rake task will do the following:
-
-* Start CouchDB, running on port 5984
-* Start and configure RabbitMQ for Chef, running on port 5672
-* Install Chef SOLR data and start chef-solr, running on port 8983
-* Start chef-server-api on port 4000
-* Start chef-server-webui on port 4001
-* Start chef-expander, the clustered search index broker
-
-You'll want to leave this terminal running the dev environment.
-
-== Web Interface:
-
-With the dev environment running, you can now access the web interface via http://localhost:4000/. The default login is admin / p@ssw0rd1.
-
-== Integration testing:
-
-We test integration with Cucumber. Normally, you'll just run:
-
-  rake features
-
-In a second terminal, to run all the feature tests. Other feature tests are available as well, see:
-
-  rake -T | grep Cucumber
-
-There are over 60 different sets of features that can be tested.
 
-= LINKS:
+== LINKS:
 
 Source:
 
-* https://github.com/opscode/chef/
+* http://github.com/opscode/chef/tree/master
 
 Tickets/Issues:
 
diff --git a/chef/Rakefile b/Rakefile
index 4340493908..4340493908 100644
--- a/chef/Rakefile
+++ b/Rakefile
diff --git a/chef/bin/chef-client b/bin/chef-client
index bfd5544319..bfd5544319 100755
--- a/chef/bin/chef-client
+++ b/bin/chef-client
diff --git a/chef/bin/chef-shell b/bin/chef-shell
index 90598d665d..90598d665d 100755
--- a/chef/bin/chef-shell
+++ b/bin/chef-shell
diff --git a/chef/bin/chef-solo b/bin/chef-solo
index 69891acb73..69891acb73 100755
--- a/chef/bin/chef-solo
+++ b/bin/chef-solo
diff --git a/chef/bin/knife b/bin/knife
index 1e2769906c..1e2769906c 100755
--- a/chef/bin/knife
+++ b/bin/knife
diff --git a/chef/bin/shef b/bin/shef
index 0862198e53..0862198e53 100755
--- a/chef/bin/shef
+++ b/bin/shef
diff --git a/chef/chef.gemspec b/chef.gemspec
index c807a85bf2..c807a85bf2 100644
--- a/chef/chef.gemspec
+++ b/chef.gemspec
diff --git a/chef/.gitignore b/chef/.gitignore
deleted file mode 100644
index 15750df43d..0000000000
--- a/chef/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-Gemfile.lock
-Gemfile.local
-spec/support/local_gems.rb
diff --git a/chef/LICENSE b/chef/LICENSE
deleted file mode 100644
index 11069edd79..0000000000
--- a/chef/LICENSE
+++ /dev/null
@@ -1,201 +0,0 @@
-                              Apache License
-                        Version 2.0, January 2004
-                     http://www.apache.org/licenses/
-
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-1. Definitions.
-
-   "License" shall mean the terms and conditions for use, reproduction,
-   and distribution as defined by Sections 1 through 9 of this document.
-
-   "Licensor" shall mean the copyright owner or entity authorized by
-   the copyright owner that is granting the License.
-
-   "Legal Entity" shall mean the union of the acting entity and all
-   other entities that control, are controlled by, or are under common
-   control with that entity. For the purposes of this definition,
-   "control" means (i) the power, direct or indirect, to cause the
-   direction or management of such entity, whether by contract or
-   otherwise, or (ii) ownership of fifty percent (50%) or more of the
-   outstanding shares, or (iii) beneficial ownership of such entity.
-
-   "You" (or "Your") shall mean an individual or Legal Entity
-   exercising permissions granted by this License.
-
-   "Source" form shall mean the preferred form for making modifications,
-   including but not limited to software source code, documentation
-   source, and configuration files.
-
-   "Object" form shall mean any form resulting from mechanical
-   transformation or translation of a Source form, including but
-   not limited to compiled object code, generated documentation,
-   and conversions to other media types.
-
-   "Work" shall mean the work of authorship, whether in Source or
-   Object form, made available under the License, as indicated by a
-   copyright notice that is included in or attached to the work
-   (an example is provided in the Appendix below).
-
-   "Derivative Works" shall mean any work, whether in Source or Object
-   form, that is based on (or derived from) the Work and for which the
-   editorial revisions, annotations, elaborations, or other modifications
-   represent, as a whole, an original work of authorship. For the purposes
-   of this License, Derivative Works shall not include works that remain
-   separable from, or merely link (or bind by name) to the interfaces of,
-   the Work and Derivative Works thereof.
-
-   "Contribution" shall mean any work of authorship, including
-   the original version of the Work and any modifications or additions
-   to that Work or Derivative Works thereof, that is intentionally
-   submitted to Licensor for inclusion in the Work by the copyright owner
-   or by an individual or Legal Entity authorized to submit on behalf of
-   the copyright owner. For the purposes of this definition, "submitted"
-   means any form of electronic, verbal, or written communication sent
-   to the Licensor or its representatives, including but not limited to
-   communication on electronic mailing lists, source code control systems,
-   and issue tracking systems that are managed by, or on behalf of, the
-   Licensor for the purpose of discussing and improving the Work, but
-   excluding communication that is conspicuously marked or otherwise
-   designated in writing by the copyright owner as "Not a Contribution."
-
-   "Contributor" shall mean Licensor and any individual or Legal Entity
-   on behalf of whom a Contribution has been received by Licensor and
-   subsequently incorporated within the Work.
-
-2. Grant of Copyright License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   copyright license to reproduce, prepare Derivative Works of,
-   publicly display, publicly perform, sublicense, and distribute the
-   Work and such Derivative Works in Source or Object form.
-
-3. Grant of Patent License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   (except as stated in this section) patent license to make, have made,
-   use, offer to sell, sell, import, and otherwise transfer the Work,
-   where such license applies only to those patent claims licensable
-   by such Contributor that are necessarily infringed by their
-   Contribution(s) alone or by combination of their Contribution(s)
-   with the Work to which such Contribution(s) was submitted. If You
-   institute patent litigation against any entity (including a
-   cross-claim or counterclaim in a lawsuit) alleging that the Work
-   or a Contribution incorporated within the Work constitutes direct
-   or contributory patent infringement, then any patent licenses
-   granted to You under this License for that Work shall terminate
-   as of the date such litigation is filed.
-
-4. Redistribution. You may reproduce and distribute copies of the
-   Work or Derivative Works thereof in any medium, with or without
-   modifications, and in Source or Object form, provided that You
-   meet the following conditions:
-
-   (a) You must give any other recipients of the Work or
-       Derivative Works a copy of this License; and
-
-   (b) You must cause any modified files to carry prominent notices
-       stating that You changed the files; and
-
-   (c) You must retain, in the Source form of any Derivative Works
-       that You distribute, all copyright, patent, trademark, and
-       attribution notices from the Source form of the Work,
-       excluding those notices that do not pertain to any part of
-       the Derivative Works; and
-
-   (d) If the Work includes a "NOTICE" text file as part of its
-       distribution, then any Derivative Works that You distribute must
-       include a readable copy of the attribution notices contained
-       within such NOTICE file, excluding those notices that do not
-       pertain to any part of the Derivative Works, in at least one
-       of the following places: within a NOTICE text file distributed
-       as part of the Derivative Works; within the Source form or
-       documentation, if provided along with the Derivative Works; or,
-       within a display generated by the Derivative Works, if and
-       wherever such third-party notices normally appear. The contents
-       of the NOTICE file are for informational purposes only and
-       do not modify the License. You may add Your own attribution
-       notices within Derivative Works that You distribute, alongside
-       or as an addendum to the NOTICE text from the Work, provided
-       that such additional attribution notices cannot be construed
-       as modifying the License.
-
-   You may add Your own copyright statement to Your modifications and
-   may provide additional or different license terms and conditions
-   for use, reproduction, or distribution of Your modifications, or
-   for any such Derivative Works as a whole, provided Your use,
-   reproduction, and distribution of the Work otherwise complies with
-   the conditions stated in this License.
-
-5. Submission of Contributions. Unless You explicitly state otherwise,
-   any Contribution intentionally submitted for inclusion in the Work
-   by You to the Licensor shall be under the terms and conditions of
-   this License, without any additional terms or conditions.
-   Notwithstanding the above, nothing herein shall supersede or modify
-   the terms of any separate license agreement you may have executed
-   with Licensor regarding such Contributions.
-
-6. Trademarks. This License does not grant permission to use the trade
-   names, trademarks, service marks, or product names of the Licensor,
-   except as required for reasonable and customary use in describing the
-   origin of the Work and reproducing the content of the NOTICE file.
-
-7. Disclaimer of Warranty. Unless required by applicable law or
-   agreed to in writing, Licensor provides the Work (and each
-   Contributor provides its Contributions) on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-   implied, including, without limitation, any warranties or conditions
-   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-   PARTICULAR PURPOSE. You are solely responsible for determining the
-   appropriateness of using or redistributing the Work and assume any
-   risks associated with Your exercise of permissions under this License.
-
-8. Limitation of Liability. In no event and under no legal theory,
-   whether in tort (including negligence), contract, or otherwise,
-   unless required by applicable law (such as deliberate and grossly
-   negligent acts) or agreed to in writing, shall any Contributor be
-   liable to You for damages, including any direct, indirect, special,
-   incidental, or consequential damages of any character arising as a
-   result of this License or out of the use or inability to use the
-   Work (including but not limited to damages for loss of goodwill,
-   work stoppage, computer failure or malfunction, or any and all
-   other commercial damages or losses), even if such Contributor
-   has been advised of the possibility of such damages.
-
-9. Accepting Warranty or Additional Liability. While redistributing
-   the Work or Derivative Works thereof, You may choose to offer,
-   and charge a fee for, acceptance of support, warranty, indemnity,
-   or other liability obligations and/or rights consistent with this
-   License. However, in accepting such obligations, You may act only
-   on Your own behalf and on Your sole responsibility, not on behalf
-   of any other Contributor, and only if You agree to indemnify,
-   defend, and hold each Contributor harmless for any liability
-   incurred by, or claims asserted against, such Contributor by reason
-   of your accepting any such warranty or additional liability.
-
-END OF TERMS AND CONDITIONS
-
-APPENDIX: How to apply the Apache License to your work.
-
-   To apply the Apache License to your work, attach the following
-   boilerplate notice, with the fields enclosed by brackets "[]"
-   replaced with your own identifying information. (Don't include
-   the brackets!)  The text should be enclosed in the appropriate
-   comment syntax for the file format. We also recommend that a
-   file or class name and description of purpose be included on the
-   same "printed page" as the copyright notice for easier
-   identification within third-party archives.
-
-Copyright [yyyy] [name of copyright owner]
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
diff --git a/chef/README.rdoc b/chef/README.rdoc
deleted file mode 100644
index 4a1801643c..0000000000
--- a/chef/README.rdoc
+++ /dev/null
@@ -1,107 +0,0 @@
-= Chef
-
-== DESCRIPTION:
-
-Chef is a configuration management tool designed to bring automation to your entire infrastructure.
-
-The Chef Wiki is the definitive source of user documentation.
-
-* http://wiki.opscode.com/display/chef/Home
-
-This README focuses on developers who want to modify Chef source code. For users who just want to run the latest and greatest Chef development version in their environment, see:
-
-* http://wiki.opscode.com/display/chef/Installing+Chef+from+HEAD
-
-== DEVELOPMENT:
-
-Before working on the code, if you plan to contribute your changes, you need to read the Opscode Contributing document.
-
-* http://wiki.opscode.com/display/opscode/Contributing
-
-You will also need to set up the repository with the appropriate branches. We document the process on the Chef Wiki.
-
-* http://wiki.opscode.com/display/opscode/Working+with+Git
-
-Once your repository is set up, you can start working on the code. We do use TDD with RSpec, so you'll need to get a development environment running.
-
-== REQUIREMENTS:
-
-Ruby 1.8.7+ [1]
-
-[1] As of 2012-05-25 Ruby 1.8.6 should still work, except for CHEF-2329.
-
-== ENVIRONMENT:
-
-In order to have a development environment where changes to the Chef code can be tested, we'll need to install a few things after setting up the Git repository.
-
-=== Non-Gem Dependencies
-
-Install these via your platform's preferred method; for example apt, yum, ports, emerge, etc.
-
-* Git[http://git-scm.com/]
-* GCC and C Standard Libraries, header files, etc. (i.e., build-essential on debian/ubuntu)
-* Ruby development package
-
-=== Runtime Rubygem Dependencies
-==== Chef Client and Solo
-* ohai
-* erubis
-* highline
-* json (1.4.4 - 1.4.6)
-* mixlib-authentication
-* mixlib-cli
-* mixlib-config
-* mixlib-log
-* moneta
-* rest-client
-* uuidtools
-* merb-core
-* net-ssh
-* fog
-
-=== Development Rubygem Dependencies
-* rake[http://rake.rubyforge.org/]
-* rspec[http://rspec.info/]
-
-Ohai is also by Opscode and available on GitHub, http://github.com/opscode/ohai/tree/master.
-
-== Spec testing:
-
-We use RSpec for unit/spec tests. It is not necessary to start the development
-environment to run the specs--they are completely standalone.
-
-  rake spec
-
-== LINKS:
-
-Source:
-
-* http://github.com/opscode/chef/tree/master
-
-Tickets/Issues:
-
-* http://tickets.opscode.com/
-
-Documentation:
-
-* http://wiki.opscode.com/display/chef/Home/
-
-= LICENSE:
-
-Chef - A configuration management system
-
-Author:: Adam Jacob (<adam@opscode.com>)
-Copyright:: Copyright (c) 2008-2012 Opscode, Inc.
-License:: Apache License, Version 2.0
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
diff --git a/chef/distro/README b/distro/README
index 36f8b12118..36f8b12118 100644
--- a/chef/distro/README
+++ b/distro/README
diff --git a/chef/distro/arch/etc/conf.d/chef-client.conf b/distro/arch/etc/conf.d/chef-client.conf
index efbead3149..efbead3149 100644
--- a/chef/distro/arch/etc/conf.d/chef-client.conf
+++ b/distro/arch/etc/conf.d/chef-client.conf
diff --git a/chef/distro/arch/etc/conf.d/chef-expander.conf b/distro/arch/etc/conf.d/chef-expander.conf
index 4c70bdd2eb..4c70bdd2eb 100644
--- a/chef/distro/arch/etc/conf.d/chef-expander.conf
+++ b/distro/arch/etc/conf.d/chef-expander.conf
diff --git a/chef/distro/arch/etc/conf.d/chef-server-webui.conf b/distro/arch/etc/conf.d/chef-server-webui.conf
index a737a84aa6..a737a84aa6 100644
--- a/chef/distro/arch/etc/conf.d/chef-server-webui.conf
+++ b/distro/arch/etc/conf.d/chef-server-webui.conf
diff --git a/chef/distro/arch/etc/conf.d/chef-server.conf b/distro/arch/etc/conf.d/chef-server.conf
index 95518ce045..95518ce045 100644
--- a/chef/distro/arch/etc/conf.d/chef-server.conf
+++ b/distro/arch/etc/conf.d/chef-server.conf
diff --git a/chef/distro/arch/etc/conf.d/chef-solr.conf b/distro/arch/etc/conf.d/chef-solr.conf
index a4764a2a8e..a4764a2a8e 100644
--- a/chef/distro/arch/etc/conf.d/chef-solr.conf
+++ b/distro/arch/etc/conf.d/chef-solr.conf
diff --git a/chef/distro/arch/etc/rc.d/chef-client b/distro/arch/etc/rc.d/chef-client
index 36f00bad6a..36f00bad6a 100644
--- a/chef/distro/arch/etc/rc.d/chef-client
+++ b/distro/arch/etc/rc.d/chef-client
diff --git a/chef/distro/arch/etc/rc.d/chef-expander b/distro/arch/etc/rc.d/chef-expander
index 5925efe2b8..5925efe2b8 100644
--- a/chef/distro/arch/etc/rc.d/chef-expander
+++ b/distro/arch/etc/rc.d/chef-expander
diff --git a/chef/distro/arch/etc/rc.d/chef-server b/distro/arch/etc/rc.d/chef-server
index 59f926c2c9..59f926c2c9 100644
--- a/chef/distro/arch/etc/rc.d/chef-server
+++ b/distro/arch/etc/rc.d/chef-server
diff --git a/chef/distro/arch/etc/rc.d/chef-server-webui b/distro/arch/etc/rc.d/chef-server-webui
index 79a9b77c1c..79a9b77c1c 100644
--- a/chef/distro/arch/etc/rc.d/chef-server-webui
+++ b/distro/arch/etc/rc.d/chef-server-webui
diff --git a/chef/distro/arch/etc/rc.d/chef-solr b/distro/arch/etc/rc.d/chef-solr
index a3682a495a..a3682a495a 100644
--- a/chef/distro/arch/etc/rc.d/chef-solr
+++ b/distro/arch/etc/rc.d/chef-solr
diff --git a/chef/distro/common/html/chef-client.8.html b/distro/common/html/chef-client.8.html
index cdcee9c7fd..cdcee9c7fd 100644
--- a/chef/distro/common/html/chef-client.8.html
+++ b/distro/common/html/chef-client.8.html
diff --git a/chef/distro/common/html/chef-expander.8.html b/distro/common/html/chef-expander.8.html
index ba17920e1e..ba17920e1e 100644
--- a/chef/distro/common/html/chef-expander.8.html
+++ b/distro/common/html/chef-expander.8.html
diff --git a/chef/distro/common/html/chef-expanderctl.8.html b/distro/common/html/chef-expanderctl.8.html
index 2ce15e019a..2ce15e019a 100644
--- a/chef/distro/common/html/chef-expanderctl.8.html
+++ b/distro/common/html/chef-expanderctl.8.html
diff --git a/chef/distro/common/html/chef-server-webui.8.html b/distro/common/html/chef-server-webui.8.html
index d28b732448..d28b732448 100644
--- a/chef/distro/common/html/chef-server-webui.8.html
+++ b/distro/common/html/chef-server-webui.8.html
diff --git a/chef/distro/common/html/chef-server.8.html b/distro/common/html/chef-server.8.html
index 6613b6c90f..6613b6c90f 100644
--- a/chef/distro/common/html/chef-server.8.html
+++ b/distro/common/html/chef-server.8.html
diff --git a/chef/distro/common/html/chef-shell.1.html b/distro/common/html/chef-shell.1.html
index 195870cc53..195870cc53 100644
--- a/chef/distro/common/html/chef-shell.1.html
+++ b/distro/common/html/chef-shell.1.html
diff --git a/chef/distro/common/html/chef-solo.8.html b/distro/common/html/chef-solo.8.html
index 727df99c9f..727df99c9f 100644
--- a/chef/distro/common/html/chef-solo.8.html
+++ b/distro/common/html/chef-solo.8.html
diff --git a/chef/distro/common/html/chef-solr.8.html b/distro/common/html/chef-solr.8.html
index 0e13c25d90..0e13c25d90 100644
--- a/chef/distro/common/html/chef-solr.8.html
+++ b/distro/common/html/chef-solr.8.html
diff --git a/chef/distro/common/html/knife-bootstrap.1.html b/distro/common/html/knife-bootstrap.1.html
index 6bc60652ca..6bc60652ca 100644
--- a/chef/distro/common/html/knife-bootstrap.1.html
+++ b/distro/common/html/knife-bootstrap.1.html
diff --git a/chef/distro/common/html/knife-client.1.html b/distro/common/html/knife-client.1.html
index bdad3299df..bdad3299df 100644
--- a/chef/distro/common/html/knife-client.1.html
+++ b/distro/common/html/knife-client.1.html
diff --git a/chef/distro/common/html/knife-configure.1.html b/distro/common/html/knife-configure.1.html
index 9394f08f0e..9394f08f0e 100644
--- a/chef/distro/common/html/knife-configure.1.html
+++ b/distro/common/html/knife-configure.1.html
diff --git a/chef/distro/common/html/knife-cookbook-site.1.html b/distro/common/html/knife-cookbook-site.1.html
index ad40a5c1d1..ad40a5c1d1 100644
--- a/chef/distro/common/html/knife-cookbook-site.1.html
+++ b/distro/common/html/knife-cookbook-site.1.html
diff --git a/chef/distro/common/html/knife-cookbook.1.html b/distro/common/html/knife-cookbook.1.html
index b98d9a9382..b98d9a9382 100644
--- a/chef/distro/common/html/knife-cookbook.1.html
+++ b/distro/common/html/knife-cookbook.1.html
diff --git a/chef/distro/common/html/knife-data-bag.1.html b/distro/common/html/knife-data-bag.1.html
index fb7f9b5646..fb7f9b5646 100644
--- a/chef/distro/common/html/knife-data-bag.1.html
+++ b/distro/common/html/knife-data-bag.1.html
diff --git a/chef/distro/common/html/knife-environment.1.html b/distro/common/html/knife-environment.1.html
index cb4ebced96..cb4ebced96 100644
--- a/chef/distro/common/html/knife-environment.1.html
+++ b/distro/common/html/knife-environment.1.html
diff --git a/chef/distro/common/html/knife-exec.1.html b/distro/common/html/knife-exec.1.html
index abd81449df..abd81449df 100644
--- a/chef/distro/common/html/knife-exec.1.html
+++ b/distro/common/html/knife-exec.1.html
diff --git a/chef/distro/common/html/knife-index.1.html b/distro/common/html/knife-index.1.html
index d5c6b6b943..d5c6b6b943 100644
--- a/chef/distro/common/html/knife-index.1.html
+++ b/distro/common/html/knife-index.1.html
diff --git a/chef/distro/common/html/knife-node.1.html b/distro/common/html/knife-node.1.html
index 48b104d458..48b104d458 100644
--- a/chef/distro/common/html/knife-node.1.html
+++ b/distro/common/html/knife-node.1.html
diff --git a/chef/distro/common/html/knife-recipe.1.html b/distro/common/html/knife-recipe.1.html
index 3f98e026a6..3f98e026a6 100644
--- a/chef/distro/common/html/knife-recipe.1.html
+++ b/distro/common/html/knife-recipe.1.html
diff --git a/chef/distro/common/html/knife-role.1.html b/distro/common/html/knife-role.1.html
index 18449b6269..18449b6269 100644
--- a/chef/distro/common/html/knife-role.1.html
+++ b/distro/common/html/knife-role.1.html
diff --git a/chef/distro/common/html/knife-search.1.html b/distro/common/html/knife-search.1.html
index 5cb47d344e..5cb47d344e 100644
--- a/chef/distro/common/html/knife-search.1.html
+++ b/distro/common/html/knife-search.1.html
diff --git a/chef/distro/common/html/knife-ssh.1.html b/distro/common/html/knife-ssh.1.html
index 693406c43d..693406c43d 100644
--- a/chef/distro/common/html/knife-ssh.1.html
+++ b/distro/common/html/knife-ssh.1.html
diff --git a/chef/distro/common/html/knife-status.1.html b/distro/common/html/knife-status.1.html
index 33aaafe5c1..33aaafe5c1 100644
--- a/chef/distro/common/html/knife-status.1.html
+++ b/distro/common/html/knife-status.1.html
diff --git a/chef/distro/common/html/knife-tag.1.html b/distro/common/html/knife-tag.1.html
index 013a296d84..013a296d84 100644
--- a/chef/distro/common/html/knife-tag.1.html
+++ b/distro/common/html/knife-tag.1.html
diff --git a/chef/distro/common/html/knife.1.html b/distro/common/html/knife.1.html
index bebaf89a87..bebaf89a87 100644
--- a/chef/distro/common/html/knife.1.html
+++ b/distro/common/html/knife.1.html
diff --git a/chef/distro/common/man/man1/chef-shell.1 b/distro/common/man/man1/chef-shell.1
index 05cb735470..05cb735470 100644
--- a/chef/distro/common/man/man1/chef-shell.1
+++ b/distro/common/man/man1/chef-shell.1
diff --git a/chef/distro/common/man/man1/knife-bootstrap.1 b/distro/common/man/man1/knife-bootstrap.1
index da5283c63d..da5283c63d 100644
--- a/chef/distro/common/man/man1/knife-bootstrap.1
+++ b/distro/common/man/man1/knife-bootstrap.1
diff --git a/chef/distro/common/man/man1/knife-client.1 b/distro/common/man/man1/knife-client.1
index 977688871b..977688871b 100644
--- a/chef/distro/common/man/man1/knife-client.1
+++ b/distro/common/man/man1/knife-client.1
diff --git a/chef/distro/common/man/man1/knife-configure.1 b/distro/common/man/man1/knife-configure.1
index fd828ca966..fd828ca966 100644
--- a/chef/distro/common/man/man1/knife-configure.1
+++ b/distro/common/man/man1/knife-configure.1
diff --git a/chef/distro/common/man/man1/knife-cookbook-site.1 b/distro/common/man/man1/knife-cookbook-site.1
index 7f17119787..7f17119787 100644
--- a/chef/distro/common/man/man1/knife-cookbook-site.1
+++ b/distro/common/man/man1/knife-cookbook-site.1
diff --git a/chef/distro/common/man/man1/knife-cookbook.1 b/distro/common/man/man1/knife-cookbook.1
index 270e23db77..270e23db77 100644
--- a/chef/distro/common/man/man1/knife-cookbook.1
+++ b/distro/common/man/man1/knife-cookbook.1
diff --git a/chef/distro/common/man/man1/knife-data-bag.1 b/distro/common/man/man1/knife-data-bag.1
index 1a7bc0c398..1a7bc0c398 100644
--- a/chef/distro/common/man/man1/knife-data-bag.1
+++ b/distro/common/man/man1/knife-data-bag.1
diff --git a/chef/distro/common/man/man1/knife-environment.1 b/distro/common/man/man1/knife-environment.1
index 07050a87fe..07050a87fe 100644
--- a/chef/distro/common/man/man1/knife-environment.1
+++ b/distro/common/man/man1/knife-environment.1
diff --git a/chef/distro/common/man/man1/knife-exec.1 b/distro/common/man/man1/knife-exec.1
index 829d58ff09..829d58ff09 100644
--- a/chef/distro/common/man/man1/knife-exec.1
+++ b/distro/common/man/man1/knife-exec.1
diff --git a/chef/distro/common/man/man1/knife-index.1 b/distro/common/man/man1/knife-index.1
index 268d4acf95..268d4acf95 100644
--- a/chef/distro/common/man/man1/knife-index.1
+++ b/distro/common/man/man1/knife-index.1
diff --git a/chef/distro/common/man/man1/knife-node.1 b/distro/common/man/man1/knife-node.1
index 4796822f6d..4796822f6d 100644
--- a/chef/distro/common/man/man1/knife-node.1
+++ b/distro/common/man/man1/knife-node.1
diff --git a/chef/distro/common/man/man1/knife-role.1 b/distro/common/man/man1/knife-role.1
index c9fee15c19..c9fee15c19 100644
--- a/chef/distro/common/man/man1/knife-role.1
+++ b/distro/common/man/man1/knife-role.1
diff --git a/chef/distro/common/man/man1/knife-search.1 b/distro/common/man/man1/knife-search.1
index 6e16e3b7d1..6e16e3b7d1 100644
--- a/chef/distro/common/man/man1/knife-search.1
+++ b/distro/common/man/man1/knife-search.1
diff --git a/chef/distro/common/man/man1/knife-ssh.1 b/distro/common/man/man1/knife-ssh.1
index bb2abeb8c2..bb2abeb8c2 100644
--- a/chef/distro/common/man/man1/knife-ssh.1
+++ b/distro/common/man/man1/knife-ssh.1
diff --git a/chef/distro/common/man/man1/knife-status.1 b/distro/common/man/man1/knife-status.1
index 69bf949259..69bf949259 100644
--- a/chef/distro/common/man/man1/knife-status.1
+++ b/distro/common/man/man1/knife-status.1
diff --git a/chef/distro/common/man/man1/knife-tag.1 b/distro/common/man/man1/knife-tag.1
index 1846ee0794..1846ee0794 100644
--- a/chef/distro/common/man/man1/knife-tag.1
+++ b/distro/common/man/man1/knife-tag.1
diff --git a/chef/distro/common/man/man1/knife.1 b/distro/common/man/man1/knife.1
index 2c33bd6c2d..2c33bd6c2d 100644
--- a/chef/distro/common/man/man1/knife.1
+++ b/distro/common/man/man1/knife.1
diff --git a/chef/distro/common/man/man8/chef-client.8 b/distro/common/man/man8/chef-client.8
index c8ecd58284..c8ecd58284 100644
--- a/chef/distro/common/man/man8/chef-client.8
+++ b/distro/common/man/man8/chef-client.8
diff --git a/chef/distro/common/man/man8/chef-expander.8 b/distro/common/man/man8/chef-expander.8
index 31d8f36b51..31d8f36b51 100644
--- a/chef/distro/common/man/man8/chef-expander.8
+++ b/distro/common/man/man8/chef-expander.8
diff --git a/chef/distro/common/man/man8/chef-expanderctl.8 b/distro/common/man/man8/chef-expanderctl.8
index d210ddaa9f..d210ddaa9f 100644
--- a/chef/distro/common/man/man8/chef-expanderctl.8
+++ b/distro/common/man/man8/chef-expanderctl.8
diff --git a/chef/distro/common/man/man8/chef-server-webui.8 b/distro/common/man/man8/chef-server-webui.8
index c5c22c3110..c5c22c3110 100644
--- a/chef/distro/common/man/man8/chef-server-webui.8
+++ b/distro/common/man/man8/chef-server-webui.8
diff --git a/chef/distro/common/man/man8/chef-server.8 b/distro/common/man/man8/chef-server.8
index 5928f7b7a1..5928f7b7a1 100644
--- a/chef/distro/common/man/man8/chef-server.8
+++ b/distro/common/man/man8/chef-server.8
diff --git a/chef/distro/common/man/man8/chef-solo.8 b/distro/common/man/man8/chef-solo.8
index 332fb1a4f0..332fb1a4f0 100644
--- a/chef/distro/common/man/man8/chef-solo.8
+++ b/distro/common/man/man8/chef-solo.8
diff --git a/chef/distro/common/man/man8/chef-solr.8 b/distro/common/man/man8/chef-solr.8
index 7f3a68f138..7f3a68f138 100644
--- a/chef/distro/common/man/man8/chef-solr.8
+++ b/distro/common/man/man8/chef-solr.8
diff --git a/chef/distro/common/markdown/README b/distro/common/markdown/README
index 0f35814baf..0f35814baf 100644
--- a/chef/distro/common/markdown/README
+++ b/distro/common/markdown/README
diff --git a/chef/distro/common/markdown/man1/chef-shell.mkd b/distro/common/markdown/man1/chef-shell.mkd
index 5525ef8ea9..5525ef8ea9 100644
--- a/chef/distro/common/markdown/man1/chef-shell.mkd
+++ b/distro/common/markdown/man1/chef-shell.mkd
diff --git a/chef/distro/common/markdown/man1/knife-bootstrap.mkd b/distro/common/markdown/man1/knife-bootstrap.mkd
index c466fc7f7f..c466fc7f7f 100644
--- a/chef/distro/common/markdown/man1/knife-bootstrap.mkd
+++ b/distro/common/markdown/man1/knife-bootstrap.mkd
diff --git a/chef/distro/common/markdown/man1/knife-client.mkd b/distro/common/markdown/man1/knife-client.mkd
index e7b732ef71..e7b732ef71 100644
--- a/chef/distro/common/markdown/man1/knife-client.mkd
+++ b/distro/common/markdown/man1/knife-client.mkd
diff --git a/chef/distro/common/markdown/man1/knife-configure.mkd b/distro/common/markdown/man1/knife-configure.mkd
index cc7dd1d96e..cc7dd1d96e 100644
--- a/chef/distro/common/markdown/man1/knife-configure.mkd
+++ b/distro/common/markdown/man1/knife-configure.mkd
diff --git a/chef/distro/common/markdown/man1/knife-cookbook-site.mkd b/distro/common/markdown/man1/knife-cookbook-site.mkd
index 7c2b0fe31b..7c2b0fe31b 100644
--- a/chef/distro/common/markdown/man1/knife-cookbook-site.mkd
+++ b/distro/common/markdown/man1/knife-cookbook-site.mkd
diff --git a/chef/distro/common/markdown/man1/knife-cookbook.mkd b/distro/common/markdown/man1/knife-cookbook.mkd
index 4f714c52f6..4f714c52f6 100644
--- a/chef/distro/common/markdown/man1/knife-cookbook.mkd
+++ b/distro/common/markdown/man1/knife-cookbook.mkd
diff --git a/chef/distro/common/markdown/man1/knife-data-bag.mkd b/distro/common/markdown/man1/knife-data-bag.mkd
index 67ec02158c..67ec02158c 100644
--- a/chef/distro/common/markdown/man1/knife-data-bag.mkd
+++ b/distro/common/markdown/man1/knife-data-bag.mkd
diff --git a/chef/distro/common/markdown/man1/knife-environment.mkd b/distro/common/markdown/man1/knife-environment.mkd
index 2eebffbce6..2eebffbce6 100644
--- a/chef/distro/common/markdown/man1/knife-environment.mkd
+++ b/distro/common/markdown/man1/knife-environment.mkd
diff --git a/chef/distro/common/markdown/man1/knife-exec.mkd b/distro/common/markdown/man1/knife-exec.mkd
index d4aa87ca46..d4aa87ca46 100644
--- a/chef/distro/common/markdown/man1/knife-exec.mkd
+++ b/distro/common/markdown/man1/knife-exec.mkd
diff --git a/chef/distro/common/markdown/man1/knife-index.mkd b/distro/common/markdown/man1/knife-index.mkd
index 812f3fe7dd..812f3fe7dd 100644
--- a/chef/distro/common/markdown/man1/knife-index.mkd
+++ b/distro/common/markdown/man1/knife-index.mkd
diff --git a/chef/distro/common/markdown/man1/knife-node.mkd b/distro/common/markdown/man1/knife-node.mkd
index 72b7d0072f..72b7d0072f 100644
--- a/chef/distro/common/markdown/man1/knife-node.mkd
+++ b/distro/common/markdown/man1/knife-node.mkd
diff --git a/chef/distro/common/markdown/man1/knife-role.mkd b/distro/common/markdown/man1/knife-role.mkd
index 7e0dac9bc5..7e0dac9bc5 100644
--- a/chef/distro/common/markdown/man1/knife-role.mkd
+++ b/distro/common/markdown/man1/knife-role.mkd
diff --git a/chef/distro/common/markdown/man1/knife-search.mkd b/distro/common/markdown/man1/knife-search.mkd
index d6729be322..d6729be322 100644
--- a/chef/distro/common/markdown/man1/knife-search.mkd
+++ b/distro/common/markdown/man1/knife-search.mkd
diff --git a/chef/distro/common/markdown/man1/knife-ssh.mkd b/distro/common/markdown/man1/knife-ssh.mkd
index 07fc5940ce..07fc5940ce 100644
--- a/chef/distro/common/markdown/man1/knife-ssh.mkd
+++ b/distro/common/markdown/man1/knife-ssh.mkd
diff --git a/chef/distro/common/markdown/man1/knife-status.mkd b/distro/common/markdown/man1/knife-status.mkd
index 07f0ff305a..07f0ff305a 100644
--- a/chef/distro/common/markdown/man1/knife-status.mkd
+++ b/distro/common/markdown/man1/knife-status.mkd
diff --git a/chef/distro/common/markdown/man1/knife-tag.mkd b/distro/common/markdown/man1/knife-tag.mkd
index 6a1a2c4b56..6a1a2c4b56 100644
--- a/chef/distro/common/markdown/man1/knife-tag.mkd
+++ b/distro/common/markdown/man1/knife-tag.mkd
diff --git a/chef/distro/common/markdown/man1/knife.mkd b/distro/common/markdown/man1/knife.mkd
index 054e220cf9..054e220cf9 100644
--- a/chef/distro/common/markdown/man1/knife.mkd
+++ b/distro/common/markdown/man1/knife.mkd
diff --git a/chef/distro/common/markdown/man8/chef-client.mkd b/distro/common/markdown/man8/chef-client.mkd
index e37d283133..e37d283133 100644
--- a/chef/distro/common/markdown/man8/chef-client.mkd
+++ b/distro/common/markdown/man8/chef-client.mkd
diff --git a/chef/distro/common/markdown/man8/chef-expander.mkd b/distro/common/markdown/man8/chef-expander.mkd
index d72ee1df9f..d72ee1df9f 100644
--- a/chef/distro/common/markdown/man8/chef-expander.mkd
+++ b/distro/common/markdown/man8/chef-expander.mkd
diff --git a/chef/distro/common/markdown/man8/chef-expanderctl.mkd b/distro/common/markdown/man8/chef-expanderctl.mkd
index 00b34e7734..00b34e7734 100644
--- a/chef/distro/common/markdown/man8/chef-expanderctl.mkd
+++ b/distro/common/markdown/man8/chef-expanderctl.mkd
diff --git a/chef/distro/common/markdown/man8/chef-server-webui.mkd b/distro/common/markdown/man8/chef-server-webui.mkd
index 977e1495e2..977e1495e2 100644
--- a/chef/distro/common/markdown/man8/chef-server-webui.mkd
+++ b/distro/common/markdown/man8/chef-server-webui.mkd
diff --git a/chef/distro/common/markdown/man8/chef-server.mkd b/distro/common/markdown/man8/chef-server.mkd
index 1b0f35eb77..1b0f35eb77 100644
--- a/chef/distro/common/markdown/man8/chef-server.mkd
+++ b/distro/common/markdown/man8/chef-server.mkd
diff --git a/chef/distro/common/markdown/man8/chef-solo.mkd b/distro/common/markdown/man8/chef-solo.mkd
index 861a0faa2d..861a0faa2d 100644
--- a/chef/distro/common/markdown/man8/chef-solo.mkd
+++ b/distro/common/markdown/man8/chef-solo.mkd
diff --git a/chef/distro/common/markdown/man8/chef-solr.mkd b/distro/common/markdown/man8/chef-solr.mkd
index 02e7d6285e..02e7d6285e 100644
--- a/chef/distro/common/markdown/man8/chef-solr.mkd
+++ b/distro/common/markdown/man8/chef-solr.mkd
diff --git a/chef/distro/debian/etc/default/chef-client b/distro/debian/etc/default/chef-client
index a6413a30d4..a6413a30d4 100644
--- a/chef/distro/debian/etc/default/chef-client
+++ b/distro/debian/etc/default/chef-client
diff --git a/chef/distro/debian/etc/default/chef-expander b/distro/debian/etc/default/chef-expander
index 3d855705ba..3d855705ba 100644
--- a/chef/distro/debian/etc/default/chef-expander
+++ b/distro/debian/etc/default/chef-expander
diff --git a/chef/distro/debian/etc/default/chef-server b/distro/debian/etc/default/chef-server
index b91a3ce81c..b91a3ce81c 100644
--- a/chef/distro/debian/etc/default/chef-server
+++ b/distro/debian/etc/default/chef-server
diff --git a/chef/distro/debian/etc/default/chef-server-webui b/distro/debian/etc/default/chef-server-webui
index 50dd22a288..50dd22a288 100644
--- a/chef/distro/debian/etc/default/chef-server-webui
+++ b/distro/debian/etc/default/chef-server-webui
diff --git a/chef/distro/debian/etc/default/chef-solr b/distro/debian/etc/default/chef-solr
index 7f5220c058..7f5220c058 100644
--- a/chef/distro/debian/etc/default/chef-solr
+++ b/distro/debian/etc/default/chef-solr
diff --git a/chef/distro/debian/etc/init.d/chef-client b/distro/debian/etc/init.d/chef-client
index 8f99748f59..8f99748f59 100755
--- a/chef/distro/debian/etc/init.d/chef-client
+++ b/distro/debian/etc/init.d/chef-client
diff --git a/chef/distro/debian/etc/init.d/chef-expander b/distro/debian/etc/init.d/chef-expander
index 7fea0e9118..7fea0e9118 100755
--- a/chef/distro/debian/etc/init.d/chef-expander
+++ b/distro/debian/etc/init.d/chef-expander
diff --git a/chef/distro/debian/etc/init.d/chef-server b/distro/debian/etc/init.d/chef-server
index f7c1ede583..f7c1ede583 100755
--- a/chef/distro/debian/etc/init.d/chef-server
+++ b/distro/debian/etc/init.d/chef-server
diff --git a/chef/distro/debian/etc/init.d/chef-server-webui b/distro/debian/etc/init.d/chef-server-webui
index c82171cedb..c82171cedb 100755
--- a/chef/distro/debian/etc/init.d/chef-server-webui
+++ b/distro/debian/etc/init.d/chef-server-webui
diff --git a/chef/distro/debian/etc/init.d/chef-solr b/distro/debian/etc/init.d/chef-solr
index 1e4c0b8b51..1e4c0b8b51 100755
--- a/chef/distro/debian/etc/init.d/chef-solr
+++ b/distro/debian/etc/init.d/chef-solr
diff --git a/chef/distro/debian/etc/init/chef-client.conf b/distro/debian/etc/init/chef-client.conf
index 1f8c6d0d9b..1f8c6d0d9b 100644
--- a/chef/distro/debian/etc/init/chef-client.conf
+++ b/distro/debian/etc/init/chef-client.conf
diff --git a/chef/distro/debian/etc/init/chef-expander.conf b/distro/debian/etc/init/chef-expander.conf
index 21ff246307..21ff246307 100644
--- a/chef/distro/debian/etc/init/chef-expander.conf
+++ b/distro/debian/etc/init/chef-expander.conf
diff --git a/chef/distro/debian/etc/init/chef-server-webui.conf b/distro/debian/etc/init/chef-server-webui.conf
index 8b443c51f5..8b443c51f5 100644
--- a/chef/distro/debian/etc/init/chef-server-webui.conf
+++ b/distro/debian/etc/init/chef-server-webui.conf
diff --git a/chef/distro/debian/etc/init/chef-server.conf b/distro/debian/etc/init/chef-server.conf
index 1eebd8f0cb..1eebd8f0cb 100644
--- a/chef/distro/debian/etc/init/chef-server.conf
+++ b/distro/debian/etc/init/chef-server.conf
diff --git a/chef/distro/debian/etc/init/chef-solr.conf b/distro/debian/etc/init/chef-solr.conf
index 4ca885e28d..4ca885e28d 100644
--- a/chef/distro/debian/etc/init/chef-solr.conf
+++ b/distro/debian/etc/init/chef-solr.conf
diff --git a/chef/distro/redhat/etc/init.d/chef-client b/distro/redhat/etc/init.d/chef-client
index fbeaa395c0..fbeaa395c0 100644
--- a/chef/distro/redhat/etc/init.d/chef-client
+++ b/distro/redhat/etc/init.d/chef-client
diff --git a/chef/distro/redhat/etc/init.d/chef-expander b/distro/redhat/etc/init.d/chef-expander
index 82ae34dd62..82ae34dd62 100644
--- a/chef/distro/redhat/etc/init.d/chef-expander
+++ b/distro/redhat/etc/init.d/chef-expander
diff --git a/chef/distro/redhat/etc/init.d/chef-server b/distro/redhat/etc/init.d/chef-server
index 44247178b5..44247178b5 100644
--- a/chef/distro/redhat/etc/init.d/chef-server
+++ b/distro/redhat/etc/init.d/chef-server
diff --git a/chef/distro/redhat/etc/init.d/chef-server-webui b/distro/redhat/etc/init.d/chef-server-webui
index f26f9c1f9a..f26f9c1f9a 100644
--- a/chef/distro/redhat/etc/init.d/chef-server-webui
+++ b/distro/redhat/etc/init.d/chef-server-webui
diff --git a/chef/distro/redhat/etc/init.d/chef-solr b/distro/redhat/etc/init.d/chef-solr
index b75c40f53f..b75c40f53f 100644
--- a/chef/distro/redhat/etc/init.d/chef-solr
+++ b/distro/redhat/etc/init.d/chef-solr
diff --git a/chef/distro/redhat/etc/logrotate.d/chef-client b/distro/redhat/etc/logrotate.d/chef-client
index 5e99edbf9a..5e99edbf9a 100644
--- a/chef/distro/redhat/etc/logrotate.d/chef-client
+++ b/distro/redhat/etc/logrotate.d/chef-client
diff --git a/chef/distro/redhat/etc/logrotate.d/chef-expander b/distro/redhat/etc/logrotate.d/chef-expander
index d68b479de2..d68b479de2 100644
--- a/chef/distro/redhat/etc/logrotate.d/chef-expander
+++ b/distro/redhat/etc/logrotate.d/chef-expander
diff --git a/chef/distro/redhat/etc/logrotate.d/chef-server b/distro/redhat/etc/logrotate.d/chef-server
index 8e2ebde311..8e2ebde311 100644
--- a/chef/distro/redhat/etc/logrotate.d/chef-server
+++ b/distro/redhat/etc/logrotate.d/chef-server
diff --git a/chef/distro/redhat/etc/logrotate.d/chef-server-webui b/distro/redhat/etc/logrotate.d/chef-server-webui
index d8781fe200..d8781fe200 100644
--- a/chef/distro/redhat/etc/logrotate.d/chef-server-webui
+++ b/distro/redhat/etc/logrotate.d/chef-server-webui
diff --git a/chef/distro/redhat/etc/logrotate.d/chef-solr b/distro/redhat/etc/logrotate.d/chef-solr
index 54f18fe196..54f18fe196 100644
--- a/chef/distro/redhat/etc/logrotate.d/chef-solr
+++ b/distro/redhat/etc/logrotate.d/chef-solr
diff --git a/chef/distro/redhat/etc/sysconfig/chef-client b/distro/redhat/etc/sysconfig/chef-client
index c65de74539..c65de74539 100644
--- a/chef/distro/redhat/etc/sysconfig/chef-client
+++ b/distro/redhat/etc/sysconfig/chef-client
diff --git a/chef/distro/redhat/etc/sysconfig/chef-expander b/distro/redhat/etc/sysconfig/chef-expander
index 9af06d6b3c..9af06d6b3c 100644
--- a/chef/distro/redhat/etc/sysconfig/chef-expander
+++ b/distro/redhat/etc/sysconfig/chef-expander
diff --git a/chef/distro/redhat/etc/sysconfig/chef-server b/distro/redhat/etc/sysconfig/chef-server
index 6b18090ba9..6b18090ba9 100644
--- a/chef/distro/redhat/etc/sysconfig/chef-server
+++ b/distro/redhat/etc/sysconfig/chef-server
diff --git a/chef/distro/redhat/etc/sysconfig/chef-server-webui b/distro/redhat/etc/sysconfig/chef-server-webui
index c08df36147..c08df36147 100644
--- a/chef/distro/redhat/etc/sysconfig/chef-server-webui
+++ b/distro/redhat/etc/sysconfig/chef-server-webui
diff --git a/chef/distro/redhat/etc/sysconfig/chef-solr b/distro/redhat/etc/sysconfig/chef-solr
index 31d99f1f1c..31d99f1f1c 100644
--- a/chef/distro/redhat/etc/sysconfig/chef-solr
+++ b/distro/redhat/etc/sysconfig/chef-solr
diff --git a/chef/distro/windows/service_manager.rb b/distro/windows/service_manager.rb
index 8d71448d6e..8d71448d6e 100644
--- a/chef/distro/windows/service_manager.rb
+++ b/distro/windows/service_manager.rb
diff --git a/chef/lib/chef.rb b/lib/chef.rb
index ef173c4212..ef173c4212 100644
--- a/chef/lib/chef.rb
+++ b/lib/chef.rb
diff --git a/chef/lib/chef/api_client.rb b/lib/chef/api_client.rb
index da05939c24..da05939c24 100644
--- a/chef/lib/chef/api_client.rb
+++ b/lib/chef/api_client.rb
diff --git a/chef/lib/chef/application.rb b/lib/chef/application.rb
index 328a81a2eb..328a81a2eb 100644
--- a/chef/lib/chef/application.rb
+++ b/lib/chef/application.rb
diff --git a/chef/lib/chef/application/agent.rb b/lib/chef/application/agent.rb
index 353d45252e..353d45252e 100644
--- a/chef/lib/chef/application/agent.rb
+++ b/lib/chef/application/agent.rb
diff --git a/chef/lib/chef/application/client.rb b/lib/chef/application/client.rb
index 3a68a41c14..3a68a41c14 100644
--- a/chef/lib/chef/application/client.rb
+++ b/lib/chef/application/client.rb
diff --git a/chef/lib/chef/application/knife.rb b/lib/chef/application/knife.rb
index 629cd9fc5f..629cd9fc5f 100644
--- a/chef/lib/chef/application/knife.rb
+++ b/lib/chef/application/knife.rb
diff --git a/chef/lib/chef/application/solo.rb b/lib/chef/application/solo.rb
index 7ec6c36e76..7ec6c36e76 100644
--- a/chef/lib/chef/application/solo.rb
+++ b/lib/chef/application/solo.rb
diff --git a/chef/lib/chef/application/windows_service.rb b/lib/chef/application/windows_service.rb
index 961ec8f92f..961ec8f92f 100644
--- a/chef/lib/chef/application/windows_service.rb
+++ b/lib/chef/application/windows_service.rb
diff --git a/chef/lib/chef/applications.rb b/lib/chef/applications.rb
index 48fd56acf4..48fd56acf4 100644
--- a/chef/lib/chef/applications.rb
+++ b/lib/chef/applications.rb
diff --git a/chef/lib/chef/checksum/storage.rb b/lib/chef/checksum/storage.rb
index 90aef57081..90aef57081 100644
--- a/chef/lib/chef/checksum/storage.rb
+++ b/lib/chef/checksum/storage.rb
diff --git a/chef/lib/chef/checksum/storage/filesystem.rb b/lib/chef/checksum/storage/filesystem.rb
index 7500a5ad85..7500a5ad85 100644
--- a/chef/lib/chef/checksum/storage/filesystem.rb
+++ b/lib/chef/checksum/storage/filesystem.rb
diff --git a/chef/lib/chef/checksum_cache.rb b/lib/chef/checksum_cache.rb
index 6db7115a56..6db7115a56 100644
--- a/chef/lib/chef/checksum_cache.rb
+++ b/lib/chef/checksum_cache.rb
diff --git a/chef/lib/chef/chef_fs.rb b/lib/chef/chef_fs.rb
index 14ab8c0a6e..14ab8c0a6e 100644
--- a/chef/lib/chef/chef_fs.rb
+++ b/lib/chef/chef_fs.rb
diff --git a/chef/lib/chef/chef_fs/command_line.rb b/lib/chef/chef_fs/command_line.rb
index a8362b962b..a8362b962b 100644
--- a/chef/lib/chef/chef_fs/command_line.rb
+++ b/lib/chef/chef_fs/command_line.rb
diff --git a/chef/lib/chef/chef_fs/file_pattern.rb b/lib/chef/chef_fs/file_pattern.rb
index 134d22cbd5..134d22cbd5 100644
--- a/chef/lib/chef/chef_fs/file_pattern.rb
+++ b/lib/chef/chef_fs/file_pattern.rb
diff --git a/chef/lib/chef/chef_fs/file_system.rb b/lib/chef/chef_fs/file_system.rb
index 1805869e32..1805869e32 100644
--- a/chef/lib/chef/chef_fs/file_system.rb
+++ b/lib/chef/chef_fs/file_system.rb
diff --git a/chef/lib/chef/chef_fs/file_system/base_fs_dir.rb b/lib/chef/chef_fs/file_system/base_fs_dir.rb
index 74038f481b..74038f481b 100644
--- a/chef/lib/chef/chef_fs/file_system/base_fs_dir.rb
+++ b/lib/chef/chef_fs/file_system/base_fs_dir.rb
diff --git a/chef/lib/chef/chef_fs/file_system/base_fs_object.rb b/lib/chef/chef_fs/file_system/base_fs_object.rb
index 855892fc89..855892fc89 100644
--- a/chef/lib/chef/chef_fs/file_system/base_fs_object.rb
+++ b/lib/chef/chef_fs/file_system/base_fs_object.rb
diff --git a/chef/lib/chef/chef_fs/file_system/chef_repository_file_system_entry.rb b/lib/chef/chef_fs/file_system/chef_repository_file_system_entry.rb
index 87d904e830..87d904e830 100644
--- a/chef/lib/chef/chef_fs/file_system/chef_repository_file_system_entry.rb
+++ b/lib/chef/chef_fs/file_system/chef_repository_file_system_entry.rb
diff --git a/chef/lib/chef/chef_fs/file_system/chef_repository_file_system_root_dir.rb b/lib/chef/chef_fs/file_system/chef_repository_file_system_root_dir.rb
index fdad68003c..fdad68003c 100644
--- a/chef/lib/chef/chef_fs/file_system/chef_repository_file_system_root_dir.rb
+++ b/lib/chef/chef_fs/file_system/chef_repository_file_system_root_dir.rb
diff --git a/chef/lib/chef/chef_fs/file_system/chef_server_root_dir.rb b/lib/chef/chef_fs/file_system/chef_server_root_dir.rb
index d3c217d11c..d3c217d11c 100644
--- a/chef/lib/chef/chef_fs/file_system/chef_server_root_dir.rb
+++ b/lib/chef/chef_fs/file_system/chef_server_root_dir.rb
diff --git a/chef/lib/chef/chef_fs/file_system/cookbook_dir.rb b/lib/chef/chef_fs/file_system/cookbook_dir.rb
index e87d5dd49d..e87d5dd49d 100644
--- a/chef/lib/chef/chef_fs/file_system/cookbook_dir.rb
+++ b/lib/chef/chef_fs/file_system/cookbook_dir.rb
diff --git a/chef/lib/chef/chef_fs/file_system/cookbook_file.rb b/lib/chef/chef_fs/file_system/cookbook_file.rb
index baa71f5d9e..baa71f5d9e 100644
--- a/chef/lib/chef/chef_fs/file_system/cookbook_file.rb
+++ b/lib/chef/chef_fs/file_system/cookbook_file.rb
diff --git a/chef/lib/chef/chef_fs/file_system/cookbook_subdir.rb b/lib/chef/chef_fs/file_system/cookbook_subdir.rb
index 73c709e01e..73c709e01e 100644
--- a/chef/lib/chef/chef_fs/file_system/cookbook_subdir.rb
+++ b/lib/chef/chef_fs/file_system/cookbook_subdir.rb
diff --git a/chef/lib/chef/chef_fs/file_system/cookbooks_dir.rb b/lib/chef/chef_fs/file_system/cookbooks_dir.rb
index 9249b42aaa..9249b42aaa 100644
--- a/chef/lib/chef/chef_fs/file_system/cookbooks_dir.rb
+++ b/lib/chef/chef_fs/file_system/cookbooks_dir.rb
diff --git a/chef/lib/chef/chef_fs/file_system/data_bag_dir.rb b/lib/chef/chef_fs/file_system/data_bag_dir.rb
index 41fb5dfc63..41fb5dfc63 100644
--- a/chef/lib/chef/chef_fs/file_system/data_bag_dir.rb
+++ b/lib/chef/chef_fs/file_system/data_bag_dir.rb
diff --git a/chef/lib/chef/chef_fs/file_system/data_bag_item.rb b/lib/chef/chef_fs/file_system/data_bag_item.rb
index 2f6eb15232..2f6eb15232 100644
--- a/chef/lib/chef/chef_fs/file_system/data_bag_item.rb
+++ b/lib/chef/chef_fs/file_system/data_bag_item.rb
diff --git a/chef/lib/chef/chef_fs/file_system/data_bags_dir.rb b/lib/chef/chef_fs/file_system/data_bags_dir.rb
index 6eca990545..6eca990545 100644
--- a/chef/lib/chef/chef_fs/file_system/data_bags_dir.rb
+++ b/lib/chef/chef_fs/file_system/data_bags_dir.rb
diff --git a/chef/lib/chef/chef_fs/file_system/file_system_entry.rb b/lib/chef/chef_fs/file_system/file_system_entry.rb
index a86e0cb82a..a86e0cb82a 100644
--- a/chef/lib/chef/chef_fs/file_system/file_system_entry.rb
+++ b/lib/chef/chef_fs/file_system/file_system_entry.rb
diff --git a/chef/lib/chef/chef_fs/file_system/file_system_error.rb b/lib/chef/chef_fs/file_system/file_system_error.rb
index a461221108..a461221108 100644
--- a/chef/lib/chef/chef_fs/file_system/file_system_error.rb
+++ b/lib/chef/chef_fs/file_system/file_system_error.rb
diff --git a/chef/lib/chef/chef_fs/file_system/file_system_root_dir.rb b/lib/chef/chef_fs/file_system/file_system_root_dir.rb
index afbf7b1901..afbf7b1901 100644
--- a/chef/lib/chef/chef_fs/file_system/file_system_root_dir.rb
+++ b/lib/chef/chef_fs/file_system/file_system_root_dir.rb
diff --git a/chef/lib/chef/chef_fs/file_system/must_delete_recursively_error.rb b/lib/chef/chef_fs/file_system/must_delete_recursively_error.rb
index d247a5b4ed..d247a5b4ed 100644
--- a/chef/lib/chef/chef_fs/file_system/must_delete_recursively_error.rb
+++ b/lib/chef/chef_fs/file_system/must_delete_recursively_error.rb
diff --git a/chef/lib/chef/chef_fs/file_system/nodes_dir.rb b/lib/chef/chef_fs/file_system/nodes_dir.rb
index 4dfbf6d850..4dfbf6d850 100644
--- a/chef/lib/chef/chef_fs/file_system/nodes_dir.rb
+++ b/lib/chef/chef_fs/file_system/nodes_dir.rb
diff --git a/chef/lib/chef/chef_fs/file_system/nonexistent_fs_object.rb b/lib/chef/chef_fs/file_system/nonexistent_fs_object.rb
index dc82e83b0d..dc82e83b0d 100644
--- a/chef/lib/chef/chef_fs/file_system/nonexistent_fs_object.rb
+++ b/lib/chef/chef_fs/file_system/nonexistent_fs_object.rb
diff --git a/chef/lib/chef/chef_fs/file_system/not_found_error.rb b/lib/chef/chef_fs/file_system/not_found_error.rb
index 0b608f1abf..0b608f1abf 100644
--- a/chef/lib/chef/chef_fs/file_system/not_found_error.rb
+++ b/lib/chef/chef_fs/file_system/not_found_error.rb
diff --git a/chef/lib/chef/chef_fs/file_system/rest_list_dir.rb b/lib/chef/chef_fs/file_system/rest_list_dir.rb
index 0e8db4d7b9..0e8db4d7b9 100644
--- a/chef/lib/chef/chef_fs/file_system/rest_list_dir.rb
+++ b/lib/chef/chef_fs/file_system/rest_list_dir.rb
diff --git a/chef/lib/chef/chef_fs/file_system/rest_list_entry.rb b/lib/chef/chef_fs/file_system/rest_list_entry.rb
index dd504ef341..dd504ef341 100644
--- a/chef/lib/chef/chef_fs/file_system/rest_list_entry.rb
+++ b/lib/chef/chef_fs/file_system/rest_list_entry.rb
diff --git a/chef/lib/chef/chef_fs/knife.rb b/lib/chef/chef_fs/knife.rb
index 8a116d980e..8a116d980e 100644
--- a/chef/lib/chef/chef_fs/knife.rb
+++ b/lib/chef/chef_fs/knife.rb
diff --git a/chef/lib/chef/chef_fs/path_utils.rb b/lib/chef/chef_fs/path_utils.rb
index 67c62a7545..67c62a7545 100644
--- a/chef/lib/chef/chef_fs/path_utils.rb
+++ b/lib/chef/chef_fs/path_utils.rb
diff --git a/chef/lib/chef/client.rb b/lib/chef/client.rb
index ea74f5f50a..ea74f5f50a 100644
--- a/chef/lib/chef/client.rb
+++ b/lib/chef/client.rb
diff --git a/chef/lib/chef/config.rb b/lib/chef/config.rb
index 61c8806a66..61c8806a66 100644
--- a/chef/lib/chef/config.rb
+++ b/lib/chef/config.rb
diff --git a/chef/lib/chef/cookbook/chefignore.rb b/lib/chef/cookbook/chefignore.rb
index e9d54639e4..e9d54639e4 100644
--- a/chef/lib/chef/cookbook/chefignore.rb
+++ b/lib/chef/cookbook/chefignore.rb
diff --git a/chef/lib/chef/cookbook/cookbook_collection.rb b/lib/chef/cookbook/cookbook_collection.rb
index ae63abfc93..ae63abfc93 100644
--- a/chef/lib/chef/cookbook/cookbook_collection.rb
+++ b/lib/chef/cookbook/cookbook_collection.rb
diff --git a/chef/lib/chef/cookbook/cookbook_version_loader.rb b/lib/chef/cookbook/cookbook_version_loader.rb
index 48de17cc5a..48de17cc5a 100644
--- a/chef/lib/chef/cookbook/cookbook_version_loader.rb
+++ b/lib/chef/cookbook/cookbook_version_loader.rb
diff --git a/chef/lib/chef/cookbook/file_system_file_vendor.rb b/lib/chef/cookbook/file_system_file_vendor.rb
index 8896e3ed30..8896e3ed30 100644
--- a/chef/lib/chef/cookbook/file_system_file_vendor.rb
+++ b/lib/chef/cookbook/file_system_file_vendor.rb
diff --git a/chef/lib/chef/cookbook/file_vendor.rb b/lib/chef/cookbook/file_vendor.rb
index 38eab185ca..38eab185ca 100644
--- a/chef/lib/chef/cookbook/file_vendor.rb
+++ b/lib/chef/cookbook/file_vendor.rb
diff --git a/chef/lib/chef/cookbook/metadata.rb b/lib/chef/cookbook/metadata.rb
index 8398de442c..8398de442c 100644
--- a/chef/lib/chef/cookbook/metadata.rb
+++ b/lib/chef/cookbook/metadata.rb
diff --git a/chef/lib/chef/cookbook/remote_file_vendor.rb b/lib/chef/cookbook/remote_file_vendor.rb
index 49de62cf65..49de62cf65 100644
--- a/chef/lib/chef/cookbook/remote_file_vendor.rb
+++ b/lib/chef/cookbook/remote_file_vendor.rb
diff --git a/chef/lib/chef/cookbook/synchronizer.rb b/lib/chef/cookbook/synchronizer.rb
index 54cadb941c..54cadb941c 100644
--- a/chef/lib/chef/cookbook/synchronizer.rb
+++ b/lib/chef/cookbook/synchronizer.rb
diff --git a/chef/lib/chef/cookbook/syntax_check.rb b/lib/chef/cookbook/syntax_check.rb
index bf7c45e252..bf7c45e252 100644
--- a/chef/lib/chef/cookbook/syntax_check.rb
+++ b/lib/chef/cookbook/syntax_check.rb
diff --git a/chef/lib/chef/cookbook_loader.rb b/lib/chef/cookbook_loader.rb
index 27cf978acb..27cf978acb 100644
--- a/chef/lib/chef/cookbook_loader.rb
+++ b/lib/chef/cookbook_loader.rb
diff --git a/chef/lib/chef/cookbook_site_streaming_uploader.rb b/lib/chef/cookbook_site_streaming_uploader.rb
index abb5499042..abb5499042 100644
--- a/chef/lib/chef/cookbook_site_streaming_uploader.rb
+++ b/lib/chef/cookbook_site_streaming_uploader.rb
diff --git a/chef/lib/chef/cookbook_uploader.rb b/lib/chef/cookbook_uploader.rb
index 8dd50ac043..8dd50ac043 100644
--- a/chef/lib/chef/cookbook_uploader.rb
+++ b/lib/chef/cookbook_uploader.rb
diff --git a/chef/lib/chef/cookbook_version.rb b/lib/chef/cookbook_version.rb
index 0e11174a07..0e11174a07 100644
--- a/chef/lib/chef/cookbook_version.rb
+++ b/lib/chef/cookbook_version.rb
diff --git a/chef/lib/chef/daemon.rb b/lib/chef/daemon.rb
index bb5ccf753a..bb5ccf753a 100644
--- a/chef/lib/chef/daemon.rb
+++ b/lib/chef/daemon.rb
diff --git a/chef/lib/chef/data_bag.rb b/lib/chef/data_bag.rb
index 9ce6215b20..9ce6215b20 100644
--- a/chef/lib/chef/data_bag.rb
+++ b/lib/chef/data_bag.rb
diff --git a/chef/lib/chef/data_bag_item.rb b/lib/chef/data_bag_item.rb
index 3528ba724a..3528ba724a 100644
--- a/chef/lib/chef/data_bag_item.rb
+++ b/lib/chef/data_bag_item.rb
diff --git a/chef/lib/chef/dsl.rb b/lib/chef/dsl.rb
index 74244fafbb..74244fafbb 100644
--- a/chef/lib/chef/dsl.rb
+++ b/lib/chef/dsl.rb
diff --git a/chef/lib/chef/dsl/data_query.rb b/lib/chef/dsl/data_query.rb
index ef5b490020..ef5b490020 100644
--- a/chef/lib/chef/dsl/data_query.rb
+++ b/lib/chef/dsl/data_query.rb
diff --git a/chef/lib/chef/dsl/include_attribute.rb b/lib/chef/dsl/include_attribute.rb
index d8342af6a7..d8342af6a7 100644
--- a/chef/lib/chef/dsl/include_attribute.rb
+++ b/lib/chef/dsl/include_attribute.rb
diff --git a/chef/lib/chef/dsl/include_recipe.rb b/lib/chef/dsl/include_recipe.rb
index 8cbee7a733..8cbee7a733 100644
--- a/chef/lib/chef/dsl/include_recipe.rb
+++ b/lib/chef/dsl/include_recipe.rb
diff --git a/chef/lib/chef/dsl/platform_introspection.rb b/lib/chef/dsl/platform_introspection.rb
index 211def2797..211def2797 100644
--- a/chef/lib/chef/dsl/platform_introspection.rb
+++ b/lib/chef/dsl/platform_introspection.rb
diff --git a/chef/lib/chef/dsl/recipe.rb b/lib/chef/dsl/recipe.rb
index 1bfe8da0e0..1bfe8da0e0 100644
--- a/chef/lib/chef/dsl/recipe.rb
+++ b/lib/chef/dsl/recipe.rb
diff --git a/chef/lib/chef/encrypted_data_bag_item.rb b/lib/chef/encrypted_data_bag_item.rb
index 048ab8d57e..048ab8d57e 100644
--- a/chef/lib/chef/encrypted_data_bag_item.rb
+++ b/lib/chef/encrypted_data_bag_item.rb
diff --git a/chef/lib/chef/environment.rb b/lib/chef/environment.rb
index 00cc253083..00cc253083 100644
--- a/chef/lib/chef/environment.rb
+++ b/lib/chef/environment.rb
diff --git a/chef/lib/chef/event_dispatch/base.rb b/lib/chef/event_dispatch/base.rb
index 232bf7f1b4..232bf7f1b4 100644
--- a/chef/lib/chef/event_dispatch/base.rb
+++ b/lib/chef/event_dispatch/base.rb
diff --git a/chef/lib/chef/event_dispatch/dispatcher.rb b/lib/chef/event_dispatch/dispatcher.rb
index 82da69a60c..82da69a60c 100644
--- a/chef/lib/chef/event_dispatch/dispatcher.rb
+++ b/lib/chef/event_dispatch/dispatcher.rb
diff --git a/chef/lib/chef/exceptions.rb b/lib/chef/exceptions.rb
index 87802639d3..87802639d3 100644
--- a/chef/lib/chef/exceptions.rb
+++ b/lib/chef/exceptions.rb
diff --git a/chef/lib/chef/file_access_control.rb b/lib/chef/file_access_control.rb
index cc7fa8fc1a..cc7fa8fc1a 100644
--- a/chef/lib/chef/file_access_control.rb
+++ b/lib/chef/file_access_control.rb
diff --git a/chef/lib/chef/file_access_control/unix.rb b/lib/chef/file_access_control/unix.rb
index 1dbfe40f2f..1dbfe40f2f 100644
--- a/chef/lib/chef/file_access_control/unix.rb
+++ b/lib/chef/file_access_control/unix.rb
diff --git a/chef/lib/chef/file_access_control/windows.rb b/lib/chef/file_access_control/windows.rb
index c08752c87d..c08752c87d 100644
--- a/chef/lib/chef/file_access_control/windows.rb
+++ b/lib/chef/file_access_control/windows.rb
diff --git a/chef/lib/chef/file_cache.rb b/lib/chef/file_cache.rb
index 89e934ea05..89e934ea05 100644
--- a/chef/lib/chef/file_cache.rb
+++ b/lib/chef/file_cache.rb
diff --git a/chef/lib/chef/formatters/base.rb b/lib/chef/formatters/base.rb
index d8b2e49d8e..d8b2e49d8e 100644
--- a/chef/lib/chef/formatters/base.rb
+++ b/lib/chef/formatters/base.rb
diff --git a/chef/lib/chef/formatters/doc.rb b/lib/chef/formatters/doc.rb
index e5b2ab17d7..e5b2ab17d7 100644
--- a/chef/lib/chef/formatters/doc.rb
+++ b/lib/chef/formatters/doc.rb
diff --git a/chef/lib/chef/formatters/error_descriptor.rb b/lib/chef/formatters/error_descriptor.rb
index abf10076be..abf10076be 100644
--- a/chef/lib/chef/formatters/error_descriptor.rb
+++ b/lib/chef/formatters/error_descriptor.rb
diff --git a/chef/lib/chef/formatters/error_inspectors.rb b/lib/chef/formatters/error_inspectors.rb
index 418457322d..418457322d 100644
--- a/chef/lib/chef/formatters/error_inspectors.rb
+++ b/lib/chef/formatters/error_inspectors.rb
diff --git a/chef/lib/chef/formatters/error_inspectors/api_error_formatting.rb b/lib/chef/formatters/error_inspectors/api_error_formatting.rb
index bb5379ed3f..bb5379ed3f 100644
--- a/chef/lib/chef/formatters/error_inspectors/api_error_formatting.rb
+++ b/lib/chef/formatters/error_inspectors/api_error_formatting.rb
diff --git a/chef/lib/chef/formatters/error_inspectors/compile_error_inspector.rb b/lib/chef/formatters/error_inspectors/compile_error_inspector.rb
index 1fa8a70b52..1fa8a70b52 100644
--- a/chef/lib/chef/formatters/error_inspectors/compile_error_inspector.rb
+++ b/lib/chef/formatters/error_inspectors/compile_error_inspector.rb
diff --git a/chef/lib/chef/formatters/error_inspectors/cookbook_resolve_error_inspector.rb b/lib/chef/formatters/error_inspectors/cookbook_resolve_error_inspector.rb
index 5642070336..5642070336 100644
--- a/chef/lib/chef/formatters/error_inspectors/cookbook_resolve_error_inspector.rb
+++ b/lib/chef/formatters/error_inspectors/cookbook_resolve_error_inspector.rb
diff --git a/chef/lib/chef/formatters/error_inspectors/cookbook_sync_error_inspector.rb b/lib/chef/formatters/error_inspectors/cookbook_sync_error_inspector.rb
index 054984a50e..054984a50e 100644
--- a/chef/lib/chef/formatters/error_inspectors/cookbook_sync_error_inspector.rb
+++ b/lib/chef/formatters/error_inspectors/cookbook_sync_error_inspector.rb
diff --git a/chef/lib/chef/formatters/error_inspectors/node_load_error_inspector.rb b/lib/chef/formatters/error_inspectors/node_load_error_inspector.rb
index 7168ac0edb..7168ac0edb 100644
--- a/chef/lib/chef/formatters/error_inspectors/node_load_error_inspector.rb
+++ b/lib/chef/formatters/error_inspectors/node_load_error_inspector.rb
diff --git a/chef/lib/chef/formatters/error_inspectors/registration_error_inspector.rb b/lib/chef/formatters/error_inspectors/registration_error_inspector.rb
index 5389f9f7d0..5389f9f7d0 100644
--- a/chef/lib/chef/formatters/error_inspectors/registration_error_inspector.rb
+++ b/lib/chef/formatters/error_inspectors/registration_error_inspector.rb
diff --git a/chef/lib/chef/formatters/error_inspectors/resource_failure_inspector.rb b/lib/chef/formatters/error_inspectors/resource_failure_inspector.rb
index 57d8de0ef9..57d8de0ef9 100644
--- a/chef/lib/chef/formatters/error_inspectors/resource_failure_inspector.rb
+++ b/lib/chef/formatters/error_inspectors/resource_failure_inspector.rb
diff --git a/chef/lib/chef/formatters/error_inspectors/run_list_expansion_error_inspector.rb b/lib/chef/formatters/error_inspectors/run_list_expansion_error_inspector.rb
index ac19a983af..ac19a983af 100644
--- a/chef/lib/chef/formatters/error_inspectors/run_list_expansion_error_inspector.rb
+++ b/lib/chef/formatters/error_inspectors/run_list_expansion_error_inspector.rb
diff --git a/chef/lib/chef/formatters/error_mapper.rb b/lib/chef/formatters/error_mapper.rb
index 2140c638bc..2140c638bc 100644
--- a/chef/lib/chef/formatters/error_mapper.rb
+++ b/lib/chef/formatters/error_mapper.rb
diff --git a/chef/lib/chef/formatters/minimal.rb b/lib/chef/formatters/minimal.rb
index a189cc67eb..a189cc67eb 100644
--- a/chef/lib/chef/formatters/minimal.rb
+++ b/lib/chef/formatters/minimal.rb
diff --git a/chef/lib/chef/handler.rb b/lib/chef/handler.rb
index c4b729eeca..c4b729eeca 100644
--- a/chef/lib/chef/handler.rb
+++ b/lib/chef/handler.rb
diff --git a/chef/lib/chef/handler/error_report.rb b/lib/chef/handler/error_report.rb
index 8bf676418d..8bf676418d 100644
--- a/chef/lib/chef/handler/error_report.rb
+++ b/lib/chef/handler/error_report.rb
diff --git a/chef/lib/chef/handler/json_file.rb b/lib/chef/handler/json_file.rb
index 977c5a2c92..977c5a2c92 100644
--- a/chef/lib/chef/handler/json_file.rb
+++ b/lib/chef/handler/json_file.rb
diff --git a/chef/lib/chef/json_compat.rb b/lib/chef/json_compat.rb
index 9f59a41839..9f59a41839 100644
--- a/chef/lib/chef/json_compat.rb
+++ b/lib/chef/json_compat.rb
diff --git a/chef/lib/chef/knife.rb b/lib/chef/knife.rb
index 35aedd2cb3..35aedd2cb3 100644
--- a/chef/lib/chef/knife.rb
+++ b/lib/chef/knife.rb
diff --git a/chef/lib/chef/knife/bootstrap.rb b/lib/chef/knife/bootstrap.rb
index a8e9201c26..a8e9201c26 100644
--- a/chef/lib/chef/knife/bootstrap.rb
+++ b/lib/chef/knife/bootstrap.rb
diff --git a/chef/lib/chef/knife/bootstrap/archlinux-gems.erb b/lib/chef/knife/bootstrap/archlinux-gems.erb
index 85d6236197..85d6236197 100644
--- a/chef/lib/chef/knife/bootstrap/archlinux-gems.erb
+++ b/lib/chef/knife/bootstrap/archlinux-gems.erb
diff --git a/chef/lib/chef/knife/bootstrap/centos5-gems.erb b/lib/chef/knife/bootstrap/centos5-gems.erb
index f9626c3c2b..f9626c3c2b 100644
--- a/chef/lib/chef/knife/bootstrap/centos5-gems.erb
+++ b/lib/chef/knife/bootstrap/centos5-gems.erb
diff --git a/chef/lib/chef/knife/bootstrap/chef-full.erb b/lib/chef/knife/bootstrap/chef-full.erb
index 771ef85884..771ef85884 100644
--- a/chef/lib/chef/knife/bootstrap/chef-full.erb
+++ b/lib/chef/knife/bootstrap/chef-full.erb
diff --git a/chef/lib/chef/knife/bootstrap/fedora13-gems.erb b/lib/chef/knife/bootstrap/fedora13-gems.erb
index a8448342df..a8448342df 100644
--- a/chef/lib/chef/knife/bootstrap/fedora13-gems.erb
+++ b/lib/chef/knife/bootstrap/fedora13-gems.erb
diff --git a/chef/lib/chef/knife/bootstrap/ubuntu10.04-apt.erb b/lib/chef/knife/bootstrap/ubuntu10.04-apt.erb
index 0e44361d82..0e44361d82 100644
--- a/chef/lib/chef/knife/bootstrap/ubuntu10.04-apt.erb
+++ b/lib/chef/knife/bootstrap/ubuntu10.04-apt.erb
diff --git a/chef/lib/chef/knife/bootstrap/ubuntu10.04-gems.erb b/lib/chef/knife/bootstrap/ubuntu10.04-gems.erb
index 63448fc4d3..63448fc4d3 100644
--- a/chef/lib/chef/knife/bootstrap/ubuntu10.04-gems.erb
+++ b/lib/chef/knife/bootstrap/ubuntu10.04-gems.erb
diff --git a/chef/lib/chef/knife/bootstrap/ubuntu12.04-gems.erb b/lib/chef/knife/bootstrap/ubuntu12.04-gems.erb
index e7da7db39b..e7da7db39b 100644
--- a/chef/lib/chef/knife/bootstrap/ubuntu12.04-gems.erb
+++ b/lib/chef/knife/bootstrap/ubuntu12.04-gems.erb
diff --git a/chef/lib/chef/knife/client_bulk_delete.rb b/lib/chef/knife/client_bulk_delete.rb
index 8bf2c2f116..8bf2c2f116 100644
--- a/chef/lib/chef/knife/client_bulk_delete.rb
+++ b/lib/chef/knife/client_bulk_delete.rb
diff --git a/chef/lib/chef/knife/client_create.rb b/lib/chef/knife/client_create.rb
index 5b5078b574..5b5078b574 100644
--- a/chef/lib/chef/knife/client_create.rb
+++ b/lib/chef/knife/client_create.rb
diff --git a/chef/lib/chef/knife/client_delete.rb b/lib/chef/knife/client_delete.rb
index 6a6fae7ea0..6a6fae7ea0 100644
--- a/chef/lib/chef/knife/client_delete.rb
+++ b/lib/chef/knife/client_delete.rb
diff --git a/chef/lib/chef/knife/client_edit.rb b/lib/chef/knife/client_edit.rb
index c81bce902a..c81bce902a 100644
--- a/chef/lib/chef/knife/client_edit.rb
+++ b/lib/chef/knife/client_edit.rb
diff --git a/chef/lib/chef/knife/client_list.rb b/lib/chef/knife/client_list.rb
index da0bf12dc3..da0bf12dc3 100644
--- a/chef/lib/chef/knife/client_list.rb
+++ b/lib/chef/knife/client_list.rb
diff --git a/chef/lib/chef/knife/client_reregister.rb b/lib/chef/knife/client_reregister.rb
index 73a93ec31d..73a93ec31d 100644
--- a/chef/lib/chef/knife/client_reregister.rb
+++ b/lib/chef/knife/client_reregister.rb
diff --git a/chef/lib/chef/knife/client_show.rb b/lib/chef/knife/client_show.rb
index 5c2ffb4183..5c2ffb4183 100644
--- a/chef/lib/chef/knife/client_show.rb
+++ b/lib/chef/knife/client_show.rb
diff --git a/chef/lib/chef/knife/configure.rb b/lib/chef/knife/configure.rb
index 0be7093e29..0be7093e29 100644
--- a/chef/lib/chef/knife/configure.rb
+++ b/lib/chef/knife/configure.rb
diff --git a/chef/lib/chef/knife/configure_client.rb b/lib/chef/knife/configure_client.rb
index 838d9a1f58..838d9a1f58 100644
--- a/chef/lib/chef/knife/configure_client.rb
+++ b/lib/chef/knife/configure_client.rb
diff --git a/chef/lib/chef/knife/cookbook_bulk_delete.rb b/lib/chef/knife/cookbook_bulk_delete.rb
index f8ad74d856..f8ad74d856 100644
--- a/chef/lib/chef/knife/cookbook_bulk_delete.rb
+++ b/lib/chef/knife/cookbook_bulk_delete.rb
diff --git a/chef/lib/chef/knife/cookbook_create.rb b/lib/chef/knife/cookbook_create.rb
index c2e92e6b42..c2e92e6b42 100644
--- a/chef/lib/chef/knife/cookbook_create.rb
+++ b/lib/chef/knife/cookbook_create.rb
diff --git a/chef/lib/chef/knife/cookbook_delete.rb b/lib/chef/knife/cookbook_delete.rb
index f436d270bd..f436d270bd 100644
--- a/chef/lib/chef/knife/cookbook_delete.rb
+++ b/lib/chef/knife/cookbook_delete.rb
diff --git a/chef/lib/chef/knife/cookbook_download.rb b/lib/chef/knife/cookbook_download.rb
index 1da1121b22..1da1121b22 100644
--- a/chef/lib/chef/knife/cookbook_download.rb
+++ b/lib/chef/knife/cookbook_download.rb
diff --git a/chef/lib/chef/knife/cookbook_list.rb b/lib/chef/knife/cookbook_list.rb
index 75f18a154b..75f18a154b 100644
--- a/chef/lib/chef/knife/cookbook_list.rb
+++ b/lib/chef/knife/cookbook_list.rb
diff --git a/chef/lib/chef/knife/cookbook_metadata.rb b/lib/chef/knife/cookbook_metadata.rb
index dfa69ae39f..dfa69ae39f 100644
--- a/chef/lib/chef/knife/cookbook_metadata.rb
+++ b/lib/chef/knife/cookbook_metadata.rb
diff --git a/chef/lib/chef/knife/cookbook_metadata_from_file.rb b/lib/chef/knife/cookbook_metadata_from_file.rb
index eb1afa8b11..eb1afa8b11 100644
--- a/chef/lib/chef/knife/cookbook_metadata_from_file.rb
+++ b/lib/chef/knife/cookbook_metadata_from_file.rb
diff --git a/chef/lib/chef/knife/cookbook_show.rb b/lib/chef/knife/cookbook_show.rb
index 3545d20817..3545d20817 100644
--- a/chef/lib/chef/knife/cookbook_show.rb
+++ b/lib/chef/knife/cookbook_show.rb
diff --git a/chef/lib/chef/knife/cookbook_site_download.rb b/lib/chef/knife/cookbook_site_download.rb
index 645b1728e6..645b1728e6 100644
--- a/chef/lib/chef/knife/cookbook_site_download.rb
+++ b/lib/chef/knife/cookbook_site_download.rb
diff --git a/chef/lib/chef/knife/cookbook_site_install.rb b/lib/chef/knife/cookbook_site_install.rb
index b2e0d84751..b2e0d84751 100644
--- a/chef/lib/chef/knife/cookbook_site_install.rb
+++ b/lib/chef/knife/cookbook_site_install.rb
diff --git a/chef/lib/chef/knife/cookbook_site_list.rb b/lib/chef/knife/cookbook_site_list.rb
index 96c4ef0eed..96c4ef0eed 100644
--- a/chef/lib/chef/knife/cookbook_site_list.rb
+++ b/lib/chef/knife/cookbook_site_list.rb
diff --git a/chef/lib/chef/knife/cookbook_site_search.rb b/lib/chef/knife/cookbook_site_search.rb
index 5df7d67327..5df7d67327 100644
--- a/chef/lib/chef/knife/cookbook_site_search.rb
+++ b/lib/chef/knife/cookbook_site_search.rb
diff --git a/chef/lib/chef/knife/cookbook_site_share.rb b/lib/chef/knife/cookbook_site_share.rb
index 77c4895dcc..77c4895dcc 100644
--- a/chef/lib/chef/knife/cookbook_site_share.rb
+++ b/lib/chef/knife/cookbook_site_share.rb
diff --git a/chef/lib/chef/knife/cookbook_site_show.rb b/lib/chef/knife/cookbook_site_show.rb
index a02dd61fc8..a02dd61fc8 100644
--- a/chef/lib/chef/knife/cookbook_site_show.rb
+++ b/lib/chef/knife/cookbook_site_show.rb
diff --git a/chef/lib/chef/knife/cookbook_site_unshare.rb b/lib/chef/knife/cookbook_site_unshare.rb
index a2828549a0..a2828549a0 100644
--- a/chef/lib/chef/knife/cookbook_site_unshare.rb
+++ b/lib/chef/knife/cookbook_site_unshare.rb
diff --git a/chef/lib/chef/knife/cookbook_site_vendor.rb b/lib/chef/knife/cookbook_site_vendor.rb
index 82575958bd..82575958bd 100644
--- a/chef/lib/chef/knife/cookbook_site_vendor.rb
+++ b/lib/chef/knife/cookbook_site_vendor.rb
diff --git a/chef/lib/chef/knife/cookbook_test.rb b/lib/chef/knife/cookbook_test.rb
index dc8f12d135..dc8f12d135 100644
--- a/chef/lib/chef/knife/cookbook_test.rb
+++ b/lib/chef/knife/cookbook_test.rb
diff --git a/chef/lib/chef/knife/cookbook_upload.rb b/lib/chef/knife/cookbook_upload.rb
index b9ecc02a54..b9ecc02a54 100644
--- a/chef/lib/chef/knife/cookbook_upload.rb
+++ b/lib/chef/knife/cookbook_upload.rb
diff --git a/chef/lib/chef/knife/core/bootstrap_context.rb b/lib/chef/knife/core/bootstrap_context.rb
index 71dc008d39..71dc008d39 100644
--- a/chef/lib/chef/knife/core/bootstrap_context.rb
+++ b/lib/chef/knife/core/bootstrap_context.rb
diff --git a/chef/lib/chef/knife/core/cookbook_scm_repo.rb b/lib/chef/knife/core/cookbook_scm_repo.rb
index 727cff3153..727cff3153 100644
--- a/chef/lib/chef/knife/core/cookbook_scm_repo.rb
+++ b/lib/chef/knife/core/cookbook_scm_repo.rb
diff --git a/chef/lib/chef/knife/core/generic_presenter.rb b/lib/chef/knife/core/generic_presenter.rb
index 0866f10147..0866f10147 100644
--- a/chef/lib/chef/knife/core/generic_presenter.rb
+++ b/lib/chef/knife/core/generic_presenter.rb
diff --git a/chef/lib/chef/knife/core/node_editor.rb b/lib/chef/knife/core/node_editor.rb
index 22ba3eaa25..22ba3eaa25 100644
--- a/chef/lib/chef/knife/core/node_editor.rb
+++ b/lib/chef/knife/core/node_editor.rb
diff --git a/chef/lib/chef/knife/core/node_presenter.rb b/lib/chef/knife/core/node_presenter.rb
index a35baf2264..a35baf2264 100644
--- a/chef/lib/chef/knife/core/node_presenter.rb
+++ b/lib/chef/knife/core/node_presenter.rb
diff --git a/chef/lib/chef/knife/core/object_loader.rb b/lib/chef/knife/core/object_loader.rb
index 1d207c10d1..1d207c10d1 100644
--- a/chef/lib/chef/knife/core/object_loader.rb
+++ b/lib/chef/knife/core/object_loader.rb
diff --git a/chef/lib/chef/knife/core/subcommand_loader.rb b/lib/chef/knife/core/subcommand_loader.rb
index 314f54bc0b..314f54bc0b 100644
--- a/chef/lib/chef/knife/core/subcommand_loader.rb
+++ b/lib/chef/knife/core/subcommand_loader.rb
diff --git a/chef/lib/chef/knife/core/text_formatter.rb b/lib/chef/knife/core/text_formatter.rb
index 60328488b2..60328488b2 100644
--- a/chef/lib/chef/knife/core/text_formatter.rb
+++ b/lib/chef/knife/core/text_formatter.rb
diff --git a/chef/lib/chef/knife/core/ui.rb b/lib/chef/knife/core/ui.rb
index 85e9612315..85e9612315 100644
--- a/chef/lib/chef/knife/core/ui.rb
+++ b/lib/chef/knife/core/ui.rb
diff --git a/chef/lib/chef/knife/data_bag_create.rb b/lib/chef/knife/data_bag_create.rb
index e644ab78d3..e644ab78d3 100644
--- a/chef/lib/chef/knife/data_bag_create.rb
+++ b/lib/chef/knife/data_bag_create.rb
diff --git a/chef/lib/chef/knife/data_bag_delete.rb b/lib/chef/knife/data_bag_delete.rb
index f8e52018a6..f8e52018a6 100644
--- a/chef/lib/chef/knife/data_bag_delete.rb
+++ b/lib/chef/knife/data_bag_delete.rb
diff --git a/chef/lib/chef/knife/data_bag_edit.rb b/lib/chef/knife/data_bag_edit.rb
index 234c77177d..234c77177d 100644
--- a/chef/lib/chef/knife/data_bag_edit.rb
+++ b/lib/chef/knife/data_bag_edit.rb
diff --git a/chef/lib/chef/knife/data_bag_from_file.rb b/lib/chef/knife/data_bag_from_file.rb
index 275cbeac52..275cbeac52 100644
--- a/chef/lib/chef/knife/data_bag_from_file.rb
+++ b/lib/chef/knife/data_bag_from_file.rb
diff --git a/chef/lib/chef/knife/data_bag_list.rb b/lib/chef/knife/data_bag_list.rb
index 31dcf984f6..31dcf984f6 100644
--- a/chef/lib/chef/knife/data_bag_list.rb
+++ b/lib/chef/knife/data_bag_list.rb
diff --git a/chef/lib/chef/knife/data_bag_show.rb b/lib/chef/knife/data_bag_show.rb
index 81b1425f78..81b1425f78 100644
--- a/chef/lib/chef/knife/data_bag_show.rb
+++ b/lib/chef/knife/data_bag_show.rb
diff --git a/chef/lib/chef/knife/delete.rb b/lib/chef/knife/delete.rb
index d7482b3085..d7482b3085 100644
--- a/chef/lib/chef/knife/delete.rb
+++ b/lib/chef/knife/delete.rb
diff --git a/chef/lib/chef/knife/diff.rb b/lib/chef/knife/diff.rb
index 57d3bf3f0c..57d3bf3f0c 100644
--- a/chef/lib/chef/knife/diff.rb
+++ b/lib/chef/knife/diff.rb
diff --git a/chef/lib/chef/knife/download.rb b/lib/chef/knife/download.rb
index f891e55530..f891e55530 100644
--- a/chef/lib/chef/knife/download.rb
+++ b/lib/chef/knife/download.rb
diff --git a/chef/lib/chef/knife/environment_create.rb b/lib/chef/knife/environment_create.rb
index 6bc00d52b9..6bc00d52b9 100644
--- a/chef/lib/chef/knife/environment_create.rb
+++ b/lib/chef/knife/environment_create.rb
diff --git a/chef/lib/chef/knife/environment_delete.rb b/lib/chef/knife/environment_delete.rb
index e17841f805..e17841f805 100644
--- a/chef/lib/chef/knife/environment_delete.rb
+++ b/lib/chef/knife/environment_delete.rb
diff --git a/chef/lib/chef/knife/environment_edit.rb b/lib/chef/knife/environment_edit.rb
index 54962ac20d..54962ac20d 100644
--- a/chef/lib/chef/knife/environment_edit.rb
+++ b/lib/chef/knife/environment_edit.rb
diff --git a/chef/lib/chef/knife/environment_from_file.rb b/lib/chef/knife/environment_from_file.rb
index af72f84622..af72f84622 100644
--- a/chef/lib/chef/knife/environment_from_file.rb
+++ b/lib/chef/knife/environment_from_file.rb
diff --git a/chef/lib/chef/knife/environment_list.rb b/lib/chef/knife/environment_list.rb
index 4e70818093..4e70818093 100644
--- a/chef/lib/chef/knife/environment_list.rb
+++ b/lib/chef/knife/environment_list.rb
diff --git a/chef/lib/chef/knife/environment_show.rb b/lib/chef/knife/environment_show.rb
index a2b1636f47..a2b1636f47 100644
--- a/chef/lib/chef/knife/environment_show.rb
+++ b/lib/chef/knife/environment_show.rb
diff --git a/chef/lib/chef/knife/exec.rb b/lib/chef/knife/exec.rb
index 3e8196c616..3e8196c616 100644
--- a/chef/lib/chef/knife/exec.rb
+++ b/lib/chef/knife/exec.rb
diff --git a/chef/lib/chef/knife/help.rb b/lib/chef/knife/help.rb
index 13fe674704..13fe674704 100644
--- a/chef/lib/chef/knife/help.rb
+++ b/lib/chef/knife/help.rb
diff --git a/chef/lib/chef/knife/help_topics.rb b/lib/chef/knife/help_topics.rb
index 8427204fd6..8427204fd6 100644
--- a/chef/lib/chef/knife/help_topics.rb
+++ b/lib/chef/knife/help_topics.rb
diff --git a/chef/lib/chef/knife/index_rebuild.rb b/lib/chef/knife/index_rebuild.rb
index b35da77619..b35da77619 100644
--- a/chef/lib/chef/knife/index_rebuild.rb
+++ b/lib/chef/knife/index_rebuild.rb
diff --git a/chef/lib/chef/knife/list.rb b/lib/chef/knife/list.rb
index 30fcb5fa35..30fcb5fa35 100644
--- a/chef/lib/chef/knife/list.rb
+++ b/lib/chef/knife/list.rb
diff --git a/chef/lib/chef/knife/node_bulk_delete.rb b/lib/chef/knife/node_bulk_delete.rb
index 89b2abe6ae..89b2abe6ae 100644
--- a/chef/lib/chef/knife/node_bulk_delete.rb
+++ b/lib/chef/knife/node_bulk_delete.rb
diff --git a/chef/lib/chef/knife/node_create.rb b/lib/chef/knife/node_create.rb
index 7f50a30c80..7f50a30c80 100644
--- a/chef/lib/chef/knife/node_create.rb
+++ b/lib/chef/knife/node_create.rb
diff --git a/chef/lib/chef/knife/node_delete.rb b/lib/chef/knife/node_delete.rb
index a645d32035..a645d32035 100644
--- a/chef/lib/chef/knife/node_delete.rb
+++ b/lib/chef/knife/node_delete.rb
diff --git a/chef/lib/chef/knife/node_edit.rb b/lib/chef/knife/node_edit.rb
index 0d6b8fcf6c..0d6b8fcf6c 100644
--- a/chef/lib/chef/knife/node_edit.rb
+++ b/lib/chef/knife/node_edit.rb
diff --git a/chef/lib/chef/knife/node_from_file.rb b/lib/chef/knife/node_from_file.rb
index d69392a8db..d69392a8db 100644
--- a/chef/lib/chef/knife/node_from_file.rb
+++ b/lib/chef/knife/node_from_file.rb
diff --git a/chef/lib/chef/knife/node_list.rb b/lib/chef/knife/node_list.rb
index 3926d101cf..3926d101cf 100644
--- a/chef/lib/chef/knife/node_list.rb
+++ b/lib/chef/knife/node_list.rb
diff --git a/chef/lib/chef/knife/node_run_list_add.rb b/lib/chef/knife/node_run_list_add.rb
index dcd41ae997..dcd41ae997 100644
--- a/chef/lib/chef/knife/node_run_list_add.rb
+++ b/lib/chef/knife/node_run_list_add.rb
diff --git a/chef/lib/chef/knife/node_run_list_remove.rb b/lib/chef/knife/node_run_list_remove.rb
index 8519fd590a..8519fd590a 100644
--- a/chef/lib/chef/knife/node_run_list_remove.rb
+++ b/lib/chef/knife/node_run_list_remove.rb
diff --git a/chef/lib/chef/knife/node_show.rb b/lib/chef/knife/node_show.rb
index 4b0be18890..4b0be18890 100644
--- a/chef/lib/chef/knife/node_show.rb
+++ b/lib/chef/knife/node_show.rb
diff --git a/chef/lib/chef/knife/raw.rb b/lib/chef/knife/raw.rb
index ad5d5f33ef..ad5d5f33ef 100644
--- a/chef/lib/chef/knife/raw.rb
+++ b/lib/chef/knife/raw.rb
diff --git a/chef/lib/chef/knife/recipe_list.rb b/lib/chef/knife/recipe_list.rb
index ed7d2a9509..ed7d2a9509 100644
--- a/chef/lib/chef/knife/recipe_list.rb
+++ b/lib/chef/knife/recipe_list.rb
diff --git a/chef/lib/chef/knife/role_bulk_delete.rb b/lib/chef/knife/role_bulk_delete.rb
index 8b24f55846..8b24f55846 100644
--- a/chef/lib/chef/knife/role_bulk_delete.rb
+++ b/lib/chef/knife/role_bulk_delete.rb
diff --git a/chef/lib/chef/knife/role_create.rb b/lib/chef/knife/role_create.rb
index e9e363e870..e9e363e870 100644
--- a/chef/lib/chef/knife/role_create.rb
+++ b/lib/chef/knife/role_create.rb
diff --git a/chef/lib/chef/knife/role_delete.rb b/lib/chef/knife/role_delete.rb
index b823f37359..b823f37359 100644
--- a/chef/lib/chef/knife/role_delete.rb
+++ b/lib/chef/knife/role_delete.rb
diff --git a/chef/lib/chef/knife/role_edit.rb b/lib/chef/knife/role_edit.rb
index b0580988a0..b0580988a0 100644
--- a/chef/lib/chef/knife/role_edit.rb
+++ b/lib/chef/knife/role_edit.rb
diff --git a/chef/lib/chef/knife/role_from_file.rb b/lib/chef/knife/role_from_file.rb
index c80218b753..c80218b753 100644
--- a/chef/lib/chef/knife/role_from_file.rb
+++ b/lib/chef/knife/role_from_file.rb
diff --git a/chef/lib/chef/knife/role_list.rb b/lib/chef/knife/role_list.rb
index 0f105b2188..0f105b2188 100644
--- a/chef/lib/chef/knife/role_list.rb
+++ b/lib/chef/knife/role_list.rb
diff --git a/chef/lib/chef/knife/role_show.rb b/lib/chef/knife/role_show.rb
index 2f09794cbb..2f09794cbb 100644
--- a/chef/lib/chef/knife/role_show.rb
+++ b/lib/chef/knife/role_show.rb
diff --git a/chef/lib/chef/knife/search.rb b/lib/chef/knife/search.rb
index da739c4e62..da739c4e62 100644
--- a/chef/lib/chef/knife/search.rb
+++ b/lib/chef/knife/search.rb
diff --git a/chef/lib/chef/knife/show.rb b/lib/chef/knife/show.rb
index 7075315b08..7075315b08 100644
--- a/chef/lib/chef/knife/show.rb
+++ b/lib/chef/knife/show.rb
diff --git a/chef/lib/chef/knife/ssh.rb b/lib/chef/knife/ssh.rb
index a1b37723a6..a1b37723a6 100644
--- a/chef/lib/chef/knife/ssh.rb
+++ b/lib/chef/knife/ssh.rb
diff --git a/chef/lib/chef/knife/status.rb b/lib/chef/knife/status.rb
index ceb394ce3a..ceb394ce3a 100644
--- a/chef/lib/chef/knife/status.rb
+++ b/lib/chef/knife/status.rb
diff --git a/chef/lib/chef/knife/tag_create.rb b/lib/chef/knife/tag_create.rb
index d3ca95242d..d3ca95242d 100644
--- a/chef/lib/chef/knife/tag_create.rb
+++ b/lib/chef/knife/tag_create.rb
diff --git a/chef/lib/chef/knife/tag_delete.rb b/lib/chef/knife/tag_delete.rb
index 10751db216..10751db216 100644
--- a/chef/lib/chef/knife/tag_delete.rb
+++ b/lib/chef/knife/tag_delete.rb
diff --git a/chef/lib/chef/knife/tag_list.rb b/lib/chef/knife/tag_list.rb
index 499eb8578c..499eb8578c 100644
--- a/chef/lib/chef/knife/tag_list.rb
+++ b/lib/chef/knife/tag_list.rb
diff --git a/chef/lib/chef/knife/upload.rb b/lib/chef/knife/upload.rb
index ff8616543e..ff8616543e 100644
--- a/chef/lib/chef/knife/upload.rb
+++ b/lib/chef/knife/upload.rb
diff --git a/chef/lib/chef/log.rb b/lib/chef/log.rb
index 7355ec7574..7355ec7574 100644
--- a/chef/lib/chef/log.rb
+++ b/lib/chef/log.rb
diff --git a/chef/lib/chef/mash.rb b/lib/chef/mash.rb
index edd254cb77..edd254cb77 100644
--- a/chef/lib/chef/mash.rb
+++ b/lib/chef/mash.rb
diff --git a/chef/lib/chef/mixin/check_helper.rb b/lib/chef/mixin/check_helper.rb
index b3a7835e09..b3a7835e09 100644
--- a/chef/lib/chef/mixin/check_helper.rb
+++ b/lib/chef/mixin/check_helper.rb
diff --git a/chef/lib/chef/mixin/checksum.rb b/lib/chef/mixin/checksum.rb
index 7b716b6285..7b716b6285 100644
--- a/chef/lib/chef/mixin/checksum.rb
+++ b/lib/chef/mixin/checksum.rb
diff --git a/chef/lib/chef/mixin/command.rb b/lib/chef/mixin/command.rb
index 55c028ff5f..55c028ff5f 100644
--- a/chef/lib/chef/mixin/command.rb
+++ b/lib/chef/mixin/command.rb
diff --git a/chef/lib/chef/mixin/command/unix.rb b/lib/chef/mixin/command/unix.rb
index b63a02663b..b63a02663b 100644
--- a/chef/lib/chef/mixin/command/unix.rb
+++ b/lib/chef/mixin/command/unix.rb
diff --git a/chef/lib/chef/mixin/command/windows.rb b/lib/chef/mixin/command/windows.rb
index e3d0cfdb18..e3d0cfdb18 100644
--- a/chef/lib/chef/mixin/command/windows.rb
+++ b/lib/chef/mixin/command/windows.rb
diff --git a/chef/lib/chef/mixin/convert_to_class_name.rb b/lib/chef/mixin/convert_to_class_name.rb
index 7b4ec7ad3f..7b4ec7ad3f 100644
--- a/chef/lib/chef/mixin/convert_to_class_name.rb
+++ b/lib/chef/mixin/convert_to_class_name.rb
diff --git a/chef/lib/chef/mixin/create_path.rb b/lib/chef/mixin/create_path.rb
index 9b5dba14f2..9b5dba14f2 100644
--- a/chef/lib/chef/mixin/create_path.rb
+++ b/lib/chef/mixin/create_path.rb
diff --git a/chef/lib/chef/mixin/deep_merge.rb b/lib/chef/mixin/deep_merge.rb
index c5bbc8d9e6..c5bbc8d9e6 100644
--- a/chef/lib/chef/mixin/deep_merge.rb
+++ b/lib/chef/mixin/deep_merge.rb
diff --git a/chef/lib/chef/mixin/deprecation.rb b/lib/chef/mixin/deprecation.rb
index cc85c4e976..cc85c4e976 100644
--- a/chef/lib/chef/mixin/deprecation.rb
+++ b/lib/chef/mixin/deprecation.rb
diff --git a/chef/lib/chef/mixin/enforce_ownership_and_permissions.rb b/lib/chef/mixin/enforce_ownership_and_permissions.rb
index 9c1e4dda93..9c1e4dda93 100644
--- a/chef/lib/chef/mixin/enforce_ownership_and_permissions.rb
+++ b/lib/chef/mixin/enforce_ownership_and_permissions.rb
diff --git a/chef/lib/chef/mixin/file_class.rb b/lib/chef/mixin/file_class.rb
index ed2cda47db..ed2cda47db 100644
--- a/chef/lib/chef/mixin/file_class.rb
+++ b/lib/chef/mixin/file_class.rb
diff --git a/chef/lib/chef/mixin/from_file.rb b/lib/chef/mixin/from_file.rb
index 609fe1de55..609fe1de55 100644
--- a/chef/lib/chef/mixin/from_file.rb
+++ b/lib/chef/mixin/from_file.rb
diff --git a/chef/lib/chef/mixin/get_source_from_package.rb b/lib/chef/mixin/get_source_from_package.rb
index 6d5cb56a27..6d5cb56a27 100644
--- a/chef/lib/chef/mixin/get_source_from_package.rb
+++ b/lib/chef/mixin/get_source_from_package.rb
diff --git a/chef/lib/chef/mixin/language.rb b/lib/chef/mixin/language.rb
index 3aa6a6d800..3aa6a6d800 100644
--- a/chef/lib/chef/mixin/language.rb
+++ b/lib/chef/mixin/language.rb
diff --git a/chef/lib/chef/mixin/language_include_attribute.rb b/lib/chef/mixin/language_include_attribute.rb
index 283773b25d..283773b25d 100644
--- a/chef/lib/chef/mixin/language_include_attribute.rb
+++ b/lib/chef/mixin/language_include_attribute.rb
diff --git a/chef/lib/chef/mixin/language_include_recipe.rb b/lib/chef/mixin/language_include_recipe.rb
index 0566046560..0566046560 100644
--- a/chef/lib/chef/mixin/language_include_recipe.rb
+++ b/lib/chef/mixin/language_include_recipe.rb
diff --git a/chef/lib/chef/mixin/params_validate.rb b/lib/chef/mixin/params_validate.rb
index 649224f978..649224f978 100644
--- a/chef/lib/chef/mixin/params_validate.rb
+++ b/lib/chef/mixin/params_validate.rb
diff --git a/chef/lib/chef/mixin/path_sanity.rb b/lib/chef/mixin/path_sanity.rb
index 1d324f54e9..1d324f54e9 100644
--- a/chef/lib/chef/mixin/path_sanity.rb
+++ b/lib/chef/mixin/path_sanity.rb
diff --git a/chef/lib/chef/mixin/recipe_definition_dsl_core.rb b/lib/chef/mixin/recipe_definition_dsl_core.rb
index ff422d892f..ff422d892f 100644
--- a/chef/lib/chef/mixin/recipe_definition_dsl_core.rb
+++ b/lib/chef/mixin/recipe_definition_dsl_core.rb
diff --git a/chef/lib/chef/mixin/securable.rb b/lib/chef/mixin/securable.rb
index 47c388b239..47c388b239 100644
--- a/chef/lib/chef/mixin/securable.rb
+++ b/lib/chef/mixin/securable.rb
diff --git a/chef/lib/chef/mixin/shell_out.rb b/lib/chef/mixin/shell_out.rb
index 4eaa509f8b..4eaa509f8b 100644
--- a/chef/lib/chef/mixin/shell_out.rb
+++ b/lib/chef/mixin/shell_out.rb
diff --git a/chef/lib/chef/mixin/template.rb b/lib/chef/mixin/template.rb
index 78148d2577..78148d2577 100644
--- a/chef/lib/chef/mixin/template.rb
+++ b/lib/chef/mixin/template.rb
diff --git a/chef/lib/chef/mixin/why_run.rb b/lib/chef/mixin/why_run.rb
index 22c58c1e54..22c58c1e54 100644
--- a/chef/lib/chef/mixin/why_run.rb
+++ b/lib/chef/mixin/why_run.rb
diff --git a/chef/lib/chef/mixin/xml_escape.rb b/lib/chef/mixin/xml_escape.rb
index dac2f0c6af..dac2f0c6af 100644
--- a/chef/lib/chef/mixin/xml_escape.rb
+++ b/lib/chef/mixin/xml_escape.rb
diff --git a/chef/lib/chef/mixins.rb b/lib/chef/mixins.rb
index 557932c0e6..557932c0e6 100644
--- a/chef/lib/chef/mixins.rb
+++ b/lib/chef/mixins.rb
diff --git a/chef/lib/chef/monkey_patches/dir.rb b/lib/chef/monkey_patches/dir.rb
index c86edcf013..c86edcf013 100644
--- a/chef/lib/chef/monkey_patches/dir.rb
+++ b/lib/chef/monkey_patches/dir.rb
diff --git a/chef/lib/chef/monkey_patches/moneta.rb b/lib/chef/monkey_patches/moneta.rb
index 1c2895db56..1c2895db56 100644
--- a/chef/lib/chef/monkey_patches/moneta.rb
+++ b/lib/chef/monkey_patches/moneta.rb
diff --git a/chef/lib/chef/monkey_patches/net_http.rb b/lib/chef/monkey_patches/net_http.rb
index ad4ba957f6..ad4ba957f6 100644
--- a/chef/lib/chef/monkey_patches/net_http.rb
+++ b/lib/chef/monkey_patches/net_http.rb
diff --git a/chef/lib/chef/monkey_patches/numeric.rb b/lib/chef/monkey_patches/numeric.rb
index 1f5ff14209..1f5ff14209 100644
--- a/chef/lib/chef/monkey_patches/numeric.rb
+++ b/lib/chef/monkey_patches/numeric.rb
diff --git a/chef/lib/chef/monkey_patches/object.rb b/lib/chef/monkey_patches/object.rb
index 017a4b7938..017a4b7938 100644
--- a/chef/lib/chef/monkey_patches/object.rb
+++ b/lib/chef/monkey_patches/object.rb
diff --git a/chef/lib/chef/monkey_patches/regexp.rb b/lib/chef/monkey_patches/regexp.rb
index 9304209edf..9304209edf 100644
--- a/chef/lib/chef/monkey_patches/regexp.rb
+++ b/lib/chef/monkey_patches/regexp.rb
diff --git a/chef/lib/chef/monkey_patches/string.rb b/lib/chef/monkey_patches/string.rb
index c77c5c8816..c77c5c8816 100644
--- a/chef/lib/chef/monkey_patches/string.rb
+++ b/lib/chef/monkey_patches/string.rb
diff --git a/chef/lib/chef/monkey_patches/tempfile.rb b/lib/chef/monkey_patches/tempfile.rb
index 3135fb1a00..3135fb1a00 100644
--- a/chef/lib/chef/monkey_patches/tempfile.rb
+++ b/lib/chef/monkey_patches/tempfile.rb
diff --git a/chef/lib/chef/nil_argument.rb b/lib/chef/nil_argument.rb
index c7cbc1b39e..c7cbc1b39e 100644
--- a/chef/lib/chef/nil_argument.rb
+++ b/lib/chef/nil_argument.rb
diff --git a/chef/lib/chef/node.rb b/lib/chef/node.rb
index 92a2374bce..92a2374bce 100644
--- a/chef/lib/chef/node.rb
+++ b/lib/chef/node.rb
diff --git a/chef/lib/chef/node/attribute.rb b/lib/chef/node/attribute.rb
index 22075533b4..22075533b4 100644
--- a/chef/lib/chef/node/attribute.rb
+++ b/lib/chef/node/attribute.rb
diff --git a/chef/lib/chef/node/attribute_collections.rb b/lib/chef/node/attribute_collections.rb
index 521687e8df..521687e8df 100644
--- a/chef/lib/chef/node/attribute_collections.rb
+++ b/lib/chef/node/attribute_collections.rb
diff --git a/chef/lib/chef/node/immutable_collections.rb b/lib/chef/node/immutable_collections.rb
index 33f722cd4a..33f722cd4a 100644
--- a/chef/lib/chef/node/immutable_collections.rb
+++ b/lib/chef/node/immutable_collections.rb
diff --git a/chef/lib/chef/platform.rb b/lib/chef/platform.rb
index 2cb6690da1..2cb6690da1 100644
--- a/chef/lib/chef/platform.rb
+++ b/lib/chef/platform.rb
diff --git a/chef/lib/chef/provider.rb b/lib/chef/provider.rb
index 7bbcc3b915..7bbcc3b915 100644
--- a/chef/lib/chef/provider.rb
+++ b/lib/chef/provider.rb
diff --git a/chef/lib/chef/provider/breakpoint.rb b/lib/chef/provider/breakpoint.rb
index 224e2758eb..224e2758eb 100644
--- a/chef/lib/chef/provider/breakpoint.rb
+++ b/lib/chef/provider/breakpoint.rb
diff --git a/chef/lib/chef/provider/cookbook_file.rb b/lib/chef/provider/cookbook_file.rb
index 431f3f2367..431f3f2367 100644
--- a/chef/lib/chef/provider/cookbook_file.rb
+++ b/lib/chef/provider/cookbook_file.rb
diff --git a/chef/lib/chef/provider/cron.rb b/lib/chef/provider/cron.rb
index a7218fea5a..a7218fea5a 100644
--- a/chef/lib/chef/provider/cron.rb
+++ b/lib/chef/provider/cron.rb
diff --git a/chef/lib/chef/provider/cron/solaris.rb b/lib/chef/provider/cron/solaris.rb
index e0811ba0ac..e0811ba0ac 100644
--- a/chef/lib/chef/provider/cron/solaris.rb
+++ b/lib/chef/provider/cron/solaris.rb
diff --git a/chef/lib/chef/provider/deploy.rb b/lib/chef/provider/deploy.rb
index 60c626ab08..60c626ab08 100644
--- a/chef/lib/chef/provider/deploy.rb
+++ b/lib/chef/provider/deploy.rb
diff --git a/chef/lib/chef/provider/deploy/revision.rb b/lib/chef/provider/deploy/revision.rb
index 3728fc6a31..3728fc6a31 100644
--- a/chef/lib/chef/provider/deploy/revision.rb
+++ b/lib/chef/provider/deploy/revision.rb
diff --git a/chef/lib/chef/provider/deploy/timestamped.rb b/lib/chef/provider/deploy/timestamped.rb
index 9c2d55b490..9c2d55b490 100644
--- a/chef/lib/chef/provider/deploy/timestamped.rb
+++ b/lib/chef/provider/deploy/timestamped.rb
diff --git a/chef/lib/chef/provider/directory.rb b/lib/chef/provider/directory.rb
index 0329aeb1ad..0329aeb1ad 100644
--- a/chef/lib/chef/provider/directory.rb
+++ b/lib/chef/provider/directory.rb
diff --git a/chef/lib/chef/provider/env.rb b/lib/chef/provider/env.rb
index e857d74d68..e857d74d68 100644
--- a/chef/lib/chef/provider/env.rb
+++ b/lib/chef/provider/env.rb
diff --git a/chef/lib/chef/provider/env/windows.rb b/lib/chef/provider/env/windows.rb
index bf728b1fae..bf728b1fae 100644
--- a/chef/lib/chef/provider/env/windows.rb
+++ b/lib/chef/provider/env/windows.rb
diff --git a/chef/lib/chef/provider/erl_call.rb b/lib/chef/provider/erl_call.rb
index 1ee1da500c..1ee1da500c 100644
--- a/chef/lib/chef/provider/erl_call.rb
+++ b/lib/chef/provider/erl_call.rb
diff --git a/chef/lib/chef/provider/execute.rb b/lib/chef/provider/execute.rb
index d6b2f91bab..d6b2f91bab 100644
--- a/chef/lib/chef/provider/execute.rb
+++ b/lib/chef/provider/execute.rb
diff --git a/chef/lib/chef/provider/file.rb b/lib/chef/provider/file.rb
index 659afc6517..659afc6517 100644
--- a/chef/lib/chef/provider/file.rb
+++ b/lib/chef/provider/file.rb
diff --git a/chef/lib/chef/provider/git.rb b/lib/chef/provider/git.rb
index cc524a2fcd..cc524a2fcd 100644
--- a/chef/lib/chef/provider/git.rb
+++ b/lib/chef/provider/git.rb
diff --git a/chef/lib/chef/provider/group.rb b/lib/chef/provider/group.rb
index 81d7d7a400..81d7d7a400 100644
--- a/chef/lib/chef/provider/group.rb
+++ b/lib/chef/provider/group.rb
diff --git a/chef/lib/chef/provider/group/aix.rb b/lib/chef/provider/group/aix.rb
index 9dedef351a..9dedef351a 100644
--- a/chef/lib/chef/provider/group/aix.rb
+++ b/lib/chef/provider/group/aix.rb
diff --git a/chef/lib/chef/provider/group/dscl.rb b/lib/chef/provider/group/dscl.rb
index a8ba32641c..a8ba32641c 100644
--- a/chef/lib/chef/provider/group/dscl.rb
+++ b/lib/chef/provider/group/dscl.rb
diff --git a/chef/lib/chef/provider/group/gpasswd.rb b/lib/chef/provider/group/gpasswd.rb
index 7fb27a7777..7fb27a7777 100644
--- a/chef/lib/chef/provider/group/gpasswd.rb
+++ b/lib/chef/provider/group/gpasswd.rb
diff --git a/chef/lib/chef/provider/group/groupadd.rb b/lib/chef/provider/group/groupadd.rb
index 544fee4304..544fee4304 100644
--- a/chef/lib/chef/provider/group/groupadd.rb
+++ b/lib/chef/provider/group/groupadd.rb
diff --git a/chef/lib/chef/provider/group/groupmod.rb b/lib/chef/provider/group/groupmod.rb
index 10fc680d78..10fc680d78 100644
--- a/chef/lib/chef/provider/group/groupmod.rb
+++ b/lib/chef/provider/group/groupmod.rb
diff --git a/chef/lib/chef/provider/group/pw.rb b/lib/chef/provider/group/pw.rb
index 3bf67a515a..3bf67a515a 100644
--- a/chef/lib/chef/provider/group/pw.rb
+++ b/lib/chef/provider/group/pw.rb
diff --git a/chef/lib/chef/provider/group/suse.rb b/lib/chef/provider/group/suse.rb
index 0b66c1f912..0b66c1f912 100644
--- a/chef/lib/chef/provider/group/suse.rb
+++ b/lib/chef/provider/group/suse.rb
diff --git a/chef/lib/chef/provider/group/usermod.rb b/lib/chef/provider/group/usermod.rb
index f0a9282831..f0a9282831 100644
--- a/chef/lib/chef/provider/group/usermod.rb
+++ b/lib/chef/provider/group/usermod.rb
diff --git a/chef/lib/chef/provider/group/windows.rb b/lib/chef/provider/group/windows.rb
index 88280408cd..88280408cd 100644
--- a/chef/lib/chef/provider/group/windows.rb
+++ b/lib/chef/provider/group/windows.rb
diff --git a/chef/lib/chef/provider/http_request.rb b/lib/chef/provider/http_request.rb
index 0ea5f8289f..0ea5f8289f 100644
--- a/chef/lib/chef/provider/http_request.rb
+++ b/lib/chef/provider/http_request.rb
diff --git a/chef/lib/chef/provider/ifconfig.rb b/lib/chef/provider/ifconfig.rb
index 86680b2229..86680b2229 100644
--- a/chef/lib/chef/provider/ifconfig.rb
+++ b/lib/chef/provider/ifconfig.rb
diff --git a/chef/lib/chef/provider/link.rb b/lib/chef/provider/link.rb
index d6f333bd2f..d6f333bd2f 100644
--- a/chef/lib/chef/provider/link.rb
+++ b/lib/chef/provider/link.rb
diff --git a/chef/lib/chef/provider/log.rb b/lib/chef/provider/log.rb
index 5d0417ebda..5d0417ebda 100644
--- a/chef/lib/chef/provider/log.rb
+++ b/lib/chef/provider/log.rb
diff --git a/chef/lib/chef/provider/mdadm.rb b/lib/chef/provider/mdadm.rb
index d93ff69c13..d93ff69c13 100644
--- a/chef/lib/chef/provider/mdadm.rb
+++ b/lib/chef/provider/mdadm.rb
diff --git a/chef/lib/chef/provider/mount.rb b/lib/chef/provider/mount.rb
index fe41997d39..fe41997d39 100644
--- a/chef/lib/chef/provider/mount.rb
+++ b/lib/chef/provider/mount.rb
diff --git a/chef/lib/chef/provider/mount/mount.rb b/lib/chef/provider/mount/mount.rb
index 9a85a9058a..9a85a9058a 100644
--- a/chef/lib/chef/provider/mount/mount.rb
+++ b/lib/chef/provider/mount/mount.rb
diff --git a/chef/lib/chef/provider/mount/windows.rb b/lib/chef/provider/mount/windows.rb
index dced0d3596..dced0d3596 100644
--- a/chef/lib/chef/provider/mount/windows.rb
+++ b/lib/chef/provider/mount/windows.rb
diff --git a/chef/lib/chef/provider/ohai.rb b/lib/chef/provider/ohai.rb
index c686f67450..c686f67450 100644
--- a/chef/lib/chef/provider/ohai.rb
+++ b/lib/chef/provider/ohai.rb
diff --git a/chef/lib/chef/provider/package.rb b/lib/chef/provider/package.rb
index a28a6f93fb..a28a6f93fb 100644
--- a/chef/lib/chef/provider/package.rb
+++ b/lib/chef/provider/package.rb
diff --git a/chef/lib/chef/provider/package/apt.rb b/lib/chef/provider/package/apt.rb
index e8939b494e..e8939b494e 100644
--- a/chef/lib/chef/provider/package/apt.rb
+++ b/lib/chef/provider/package/apt.rb
diff --git a/chef/lib/chef/provider/package/dpkg.rb b/lib/chef/provider/package/dpkg.rb
index 795a7b308b..795a7b308b 100644
--- a/chef/lib/chef/provider/package/dpkg.rb
+++ b/lib/chef/provider/package/dpkg.rb
diff --git a/chef/lib/chef/provider/package/easy_install.rb b/lib/chef/provider/package/easy_install.rb
index 6c9dacc55d..6c9dacc55d 100644
--- a/chef/lib/chef/provider/package/easy_install.rb
+++ b/lib/chef/provider/package/easy_install.rb
diff --git a/chef/lib/chef/provider/package/freebsd.rb b/lib/chef/provider/package/freebsd.rb
index afdd0d812e..afdd0d812e 100644
--- a/chef/lib/chef/provider/package/freebsd.rb
+++ b/lib/chef/provider/package/freebsd.rb
diff --git a/chef/lib/chef/provider/package/ips.rb b/lib/chef/provider/package/ips.rb
index 5beb46a20a..5beb46a20a 100644
--- a/chef/lib/chef/provider/package/ips.rb
+++ b/lib/chef/provider/package/ips.rb
diff --git a/chef/lib/chef/provider/package/macports.rb b/lib/chef/provider/package/macports.rb
index fd33788944..fd33788944 100644
--- a/chef/lib/chef/provider/package/macports.rb
+++ b/lib/chef/provider/package/macports.rb
diff --git a/chef/lib/chef/provider/package/pacman.rb b/lib/chef/provider/package/pacman.rb
index f81486ae84..f81486ae84 100644
--- a/chef/lib/chef/provider/package/pacman.rb
+++ b/lib/chef/provider/package/pacman.rb
diff --git a/chef/lib/chef/provider/package/portage.rb b/lib/chef/provider/package/portage.rb
index eb13e9855a..eb13e9855a 100644
--- a/chef/lib/chef/provider/package/portage.rb
+++ b/lib/chef/provider/package/portage.rb
diff --git a/chef/lib/chef/provider/package/rpm.rb b/lib/chef/provider/package/rpm.rb
index 033ce8efb9..033ce8efb9 100644
--- a/chef/lib/chef/provider/package/rpm.rb
+++ b/lib/chef/provider/package/rpm.rb
diff --git a/chef/lib/chef/provider/package/rubygems.rb b/lib/chef/provider/package/rubygems.rb
index e60d73ab62..e60d73ab62 100644
--- a/chef/lib/chef/provider/package/rubygems.rb
+++ b/lib/chef/provider/package/rubygems.rb
diff --git a/chef/lib/chef/provider/package/smartos.rb b/lib/chef/provider/package/smartos.rb
index a3ef1e5e86..a3ef1e5e86 100644
--- a/chef/lib/chef/provider/package/smartos.rb
+++ b/lib/chef/provider/package/smartos.rb
diff --git a/chef/lib/chef/provider/package/solaris.rb b/lib/chef/provider/package/solaris.rb
index f502a0dc96..f502a0dc96 100644
--- a/chef/lib/chef/provider/package/solaris.rb
+++ b/lib/chef/provider/package/solaris.rb
diff --git a/chef/lib/chef/provider/package/yum-dump.py b/lib/chef/provider/package/yum-dump.py
index 99136eceec..99136eceec 100644
--- a/chef/lib/chef/provider/package/yum-dump.py
+++ b/lib/chef/provider/package/yum-dump.py
diff --git a/chef/lib/chef/provider/package/yum.rb b/lib/chef/provider/package/yum.rb
index 9048048b83..9048048b83 100644
--- a/chef/lib/chef/provider/package/yum.rb
+++ b/lib/chef/provider/package/yum.rb
diff --git a/chef/lib/chef/provider/package/zypper.rb b/lib/chef/provider/package/zypper.rb
index 43727466e2..43727466e2 100644
--- a/chef/lib/chef/provider/package/zypper.rb
+++ b/lib/chef/provider/package/zypper.rb
diff --git a/chef/lib/chef/provider/remote_directory.rb b/lib/chef/provider/remote_directory.rb
index 9ccd7ea056..9ccd7ea056 100644
--- a/chef/lib/chef/provider/remote_directory.rb
+++ b/lib/chef/provider/remote_directory.rb
diff --git a/chef/lib/chef/provider/remote_file.rb b/lib/chef/provider/remote_file.rb
index 90e367f558..90e367f558 100644
--- a/chef/lib/chef/provider/remote_file.rb
+++ b/lib/chef/provider/remote_file.rb
diff --git a/chef/lib/chef/provider/resource_update.rb b/lib/chef/provider/resource_update.rb
index e2c6bffca4..e2c6bffca4 100644
--- a/chef/lib/chef/provider/resource_update.rb
+++ b/lib/chef/provider/resource_update.rb
diff --git a/chef/lib/chef/provider/route.rb b/lib/chef/provider/route.rb
index 5aedcb99ec..5aedcb99ec 100644
--- a/chef/lib/chef/provider/route.rb
+++ b/lib/chef/provider/route.rb
diff --git a/chef/lib/chef/provider/ruby_block.rb b/lib/chef/provider/ruby_block.rb
index 16908b0eff..16908b0eff 100644
--- a/chef/lib/chef/provider/ruby_block.rb
+++ b/lib/chef/provider/ruby_block.rb
diff --git a/chef/lib/chef/provider/script.rb b/lib/chef/provider/script.rb
index 9e5a7d7fe1..9e5a7d7fe1 100644
--- a/chef/lib/chef/provider/script.rb
+++ b/lib/chef/provider/script.rb
diff --git a/chef/lib/chef/provider/service.rb b/lib/chef/provider/service.rb
index decca7fd7c..decca7fd7c 100644
--- a/chef/lib/chef/provider/service.rb
+++ b/lib/chef/provider/service.rb
diff --git a/chef/lib/chef/provider/service/arch.rb b/lib/chef/provider/service/arch.rb
index 8c8216c37f..8c8216c37f 100644
--- a/chef/lib/chef/provider/service/arch.rb
+++ b/lib/chef/provider/service/arch.rb
diff --git a/chef/lib/chef/provider/service/debian.rb b/lib/chef/provider/service/debian.rb
index e2a0f60d91..e2a0f60d91 100644
--- a/chef/lib/chef/provider/service/debian.rb
+++ b/lib/chef/provider/service/debian.rb
diff --git a/chef/lib/chef/provider/service/freebsd.rb b/lib/chef/provider/service/freebsd.rb
index b875838ec2..b875838ec2 100644
--- a/chef/lib/chef/provider/service/freebsd.rb
+++ b/lib/chef/provider/service/freebsd.rb
diff --git a/chef/lib/chef/provider/service/gentoo.rb b/lib/chef/provider/service/gentoo.rb
index 45b5a21f9b..45b5a21f9b 100644
--- a/chef/lib/chef/provider/service/gentoo.rb
+++ b/lib/chef/provider/service/gentoo.rb
diff --git a/chef/lib/chef/provider/service/init.rb b/lib/chef/provider/service/init.rb
index ab843d764d..ab843d764d 100644
--- a/chef/lib/chef/provider/service/init.rb
+++ b/lib/chef/provider/service/init.rb
diff --git a/chef/lib/chef/provider/service/insserv.rb b/lib/chef/provider/service/insserv.rb
index 32152376ee..32152376ee 100644
--- a/chef/lib/chef/provider/service/insserv.rb
+++ b/lib/chef/provider/service/insserv.rb
diff --git a/chef/lib/chef/provider/service/invokercd.rb b/lib/chef/provider/service/invokercd.rb
index 69a17bb4fb..69a17bb4fb 100644
--- a/chef/lib/chef/provider/service/invokercd.rb
+++ b/lib/chef/provider/service/invokercd.rb
diff --git a/chef/lib/chef/provider/service/macosx.rb b/lib/chef/provider/service/macosx.rb
index 72c02779c6..72c02779c6 100644
--- a/chef/lib/chef/provider/service/macosx.rb
+++ b/lib/chef/provider/service/macosx.rb
diff --git a/chef/lib/chef/provider/service/redhat.rb b/lib/chef/provider/service/redhat.rb
index 629e4ee0c3..629e4ee0c3 100644
--- a/chef/lib/chef/provider/service/redhat.rb
+++ b/lib/chef/provider/service/redhat.rb
diff --git a/chef/lib/chef/provider/service/simple.rb b/lib/chef/provider/service/simple.rb
index 670c62d480..670c62d480 100644
--- a/chef/lib/chef/provider/service/simple.rb
+++ b/lib/chef/provider/service/simple.rb
diff --git a/chef/lib/chef/provider/service/solaris.rb b/lib/chef/provider/service/solaris.rb
index 8e131590e8..8e131590e8 100644
--- a/chef/lib/chef/provider/service/solaris.rb
+++ b/lib/chef/provider/service/solaris.rb
diff --git a/chef/lib/chef/provider/service/systemd.rb b/lib/chef/provider/service/systemd.rb
index 59b4fe1564..59b4fe1564 100644
--- a/chef/lib/chef/provider/service/systemd.rb
+++ b/lib/chef/provider/service/systemd.rb
diff --git a/chef/lib/chef/provider/service/upstart.rb b/lib/chef/provider/service/upstart.rb
index 763a2aa92b..763a2aa92b 100644
--- a/chef/lib/chef/provider/service/upstart.rb
+++ b/lib/chef/provider/service/upstart.rb
diff --git a/chef/lib/chef/provider/service/windows.rb b/lib/chef/provider/service/windows.rb
index ba51e53bed..ba51e53bed 100644
--- a/chef/lib/chef/provider/service/windows.rb
+++ b/lib/chef/provider/service/windows.rb
diff --git a/chef/lib/chef/provider/subversion.rb b/lib/chef/provider/subversion.rb
index e1f87b4dd8..e1f87b4dd8 100644
--- a/chef/lib/chef/provider/subversion.rb
+++ b/lib/chef/provider/subversion.rb
diff --git a/chef/lib/chef/provider/template.rb b/lib/chef/provider/template.rb
index c937b9d980..c937b9d980 100644
--- a/chef/lib/chef/provider/template.rb
+++ b/lib/chef/provider/template.rb
diff --git a/chef/lib/chef/provider/user.rb b/lib/chef/provider/user.rb
index e73c9de57e..e73c9de57e 100644
--- a/chef/lib/chef/provider/user.rb
+++ b/lib/chef/provider/user.rb
diff --git a/chef/lib/chef/provider/user/dscl.rb b/lib/chef/provider/user/dscl.rb
index 94e8420c43..94e8420c43 100644
--- a/chef/lib/chef/provider/user/dscl.rb
+++ b/lib/chef/provider/user/dscl.rb
diff --git a/chef/lib/chef/provider/user/pw.rb b/lib/chef/provider/user/pw.rb
index 4f6393da89..4f6393da89 100644
--- a/chef/lib/chef/provider/user/pw.rb
+++ b/lib/chef/provider/user/pw.rb
diff --git a/chef/lib/chef/provider/user/useradd.rb b/lib/chef/provider/user/useradd.rb
index 489632f722..489632f722 100644
--- a/chef/lib/chef/provider/user/useradd.rb
+++ b/lib/chef/provider/user/useradd.rb
diff --git a/chef/lib/chef/provider/user/windows.rb b/lib/chef/provider/user/windows.rb
index 6bbb2a088c..6bbb2a088c 100644
--- a/chef/lib/chef/provider/user/windows.rb
+++ b/lib/chef/provider/user/windows.rb
diff --git a/chef/lib/chef/providers.rb b/lib/chef/providers.rb
index 36281abf6a..36281abf6a 100644
--- a/chef/lib/chef/providers.rb
+++ b/lib/chef/providers.rb
diff --git a/chef/lib/chef/recipe.rb b/lib/chef/recipe.rb
index aca35db049..aca35db049 100644
--- a/chef/lib/chef/recipe.rb
+++ b/lib/chef/recipe.rb
diff --git a/chef/lib/chef/reserved_names.rb b/lib/chef/reserved_names.rb
index 029cddac9a..029cddac9a 100644
--- a/chef/lib/chef/reserved_names.rb
+++ b/lib/chef/reserved_names.rb
diff --git a/chef/lib/chef/resource.rb b/lib/chef/resource.rb
index 9a1b983360..9a1b983360 100644
--- a/chef/lib/chef/resource.rb
+++ b/lib/chef/resource.rb
diff --git a/chef/lib/chef/resource/apt_package.rb b/lib/chef/resource/apt_package.rb
index 524abbb370..524abbb370 100644
--- a/chef/lib/chef/resource/apt_package.rb
+++ b/lib/chef/resource/apt_package.rb
diff --git a/chef/lib/chef/resource/bash.rb b/lib/chef/resource/bash.rb
index 374bca9e11..374bca9e11 100644
--- a/chef/lib/chef/resource/bash.rb
+++ b/lib/chef/resource/bash.rb
diff --git a/chef/lib/chef/resource/breakpoint.rb b/lib/chef/resource/breakpoint.rb
index 34aeae6b47..34aeae6b47 100644
--- a/chef/lib/chef/resource/breakpoint.rb
+++ b/lib/chef/resource/breakpoint.rb
diff --git a/chef/lib/chef/resource/chef_gem.rb b/lib/chef/resource/chef_gem.rb
index d8de0edc00..d8de0edc00 100644
--- a/chef/lib/chef/resource/chef_gem.rb
+++ b/lib/chef/resource/chef_gem.rb
diff --git a/chef/lib/chef/resource/conditional.rb b/lib/chef/resource/conditional.rb
index 3f892af827..3f892af827 100644
--- a/chef/lib/chef/resource/conditional.rb
+++ b/lib/chef/resource/conditional.rb
diff --git a/chef/lib/chef/resource/cookbook_file.rb b/lib/chef/resource/cookbook_file.rb
index de758aef71..de758aef71 100644
--- a/chef/lib/chef/resource/cookbook_file.rb
+++ b/lib/chef/resource/cookbook_file.rb
diff --git a/chef/lib/chef/resource/cron.rb b/lib/chef/resource/cron.rb
index 5f858cec81..5f858cec81 100644
--- a/chef/lib/chef/resource/cron.rb
+++ b/lib/chef/resource/cron.rb
diff --git a/chef/lib/chef/resource/csh.rb b/lib/chef/resource/csh.rb
index 6e871e8605..6e871e8605 100644
--- a/chef/lib/chef/resource/csh.rb
+++ b/lib/chef/resource/csh.rb
diff --git a/chef/lib/chef/resource/deploy.rb b/lib/chef/resource/deploy.rb
index 8b614028bf..8b614028bf 100644
--- a/chef/lib/chef/resource/deploy.rb
+++ b/lib/chef/resource/deploy.rb
diff --git a/chef/lib/chef/resource/deploy_revision.rb b/lib/chef/resource/deploy_revision.rb
index 55a3e38130..55a3e38130 100644
--- a/chef/lib/chef/resource/deploy_revision.rb
+++ b/lib/chef/resource/deploy_revision.rb
diff --git a/chef/lib/chef/resource/directory.rb b/lib/chef/resource/directory.rb
index a5d5ea7366..a5d5ea7366 100644
--- a/chef/lib/chef/resource/directory.rb
+++ b/lib/chef/resource/directory.rb
diff --git a/chef/lib/chef/resource/dpkg_package.rb b/lib/chef/resource/dpkg_package.rb
index 02886e8649..02886e8649 100644
--- a/chef/lib/chef/resource/dpkg_package.rb
+++ b/lib/chef/resource/dpkg_package.rb
diff --git a/chef/lib/chef/resource/easy_install_package.rb b/lib/chef/resource/easy_install_package.rb
index 10e80bdd3b..10e80bdd3b 100644
--- a/chef/lib/chef/resource/easy_install_package.rb
+++ b/lib/chef/resource/easy_install_package.rb
diff --git a/chef/lib/chef/resource/env.rb b/lib/chef/resource/env.rb
index 4b5fe6cc09..4b5fe6cc09 100644
--- a/chef/lib/chef/resource/env.rb
+++ b/lib/chef/resource/env.rb
diff --git a/chef/lib/chef/resource/erl_call.rb b/lib/chef/resource/erl_call.rb
index e0e38926bb..e0e38926bb 100644
--- a/chef/lib/chef/resource/erl_call.rb
+++ b/lib/chef/resource/erl_call.rb
diff --git a/chef/lib/chef/resource/execute.rb b/lib/chef/resource/execute.rb
index 6c07bf9352..6c07bf9352 100644
--- a/chef/lib/chef/resource/execute.rb
+++ b/lib/chef/resource/execute.rb
diff --git a/chef/lib/chef/resource/file.rb b/lib/chef/resource/file.rb
index 0b92f3332d..0b92f3332d 100644
--- a/chef/lib/chef/resource/file.rb
+++ b/lib/chef/resource/file.rb
diff --git a/chef/lib/chef/resource/freebsd_package.rb b/lib/chef/resource/freebsd_package.rb
index 9a9a84900e..9a9a84900e 100644
--- a/chef/lib/chef/resource/freebsd_package.rb
+++ b/lib/chef/resource/freebsd_package.rb
diff --git a/chef/lib/chef/resource/gem_package.rb b/lib/chef/resource/gem_package.rb
index 6def7b6653..6def7b6653 100644
--- a/chef/lib/chef/resource/gem_package.rb
+++ b/lib/chef/resource/gem_package.rb
diff --git a/chef/lib/chef/resource/git.rb b/lib/chef/resource/git.rb
index 774bb24f24..774bb24f24 100644
--- a/chef/lib/chef/resource/git.rb
+++ b/lib/chef/resource/git.rb
diff --git a/chef/lib/chef/resource/group.rb b/lib/chef/resource/group.rb
index 76f3a779ae..76f3a779ae 100644
--- a/chef/lib/chef/resource/group.rb
+++ b/lib/chef/resource/group.rb
diff --git a/chef/lib/chef/resource/http_request.rb b/lib/chef/resource/http_request.rb
index d31ff0b1c9..d31ff0b1c9 100644
--- a/chef/lib/chef/resource/http_request.rb
+++ b/lib/chef/resource/http_request.rb
diff --git a/chef/lib/chef/resource/ifconfig.rb b/lib/chef/resource/ifconfig.rb
index daa8a572a0..daa8a572a0 100644
--- a/chef/lib/chef/resource/ifconfig.rb
+++ b/lib/chef/resource/ifconfig.rb
diff --git a/chef/lib/chef/resource/ips_package.rb b/lib/chef/resource/ips_package.rb
index f82e0877df..f82e0877df 100644
--- a/chef/lib/chef/resource/ips_package.rb
+++ b/lib/chef/resource/ips_package.rb
diff --git a/chef/lib/chef/resource/link.rb b/lib/chef/resource/link.rb
index a0fab0428d..a0fab0428d 100644
--- a/chef/lib/chef/resource/link.rb
+++ b/lib/chef/resource/link.rb
diff --git a/chef/lib/chef/resource/log.rb b/lib/chef/resource/log.rb
index d1b6b5af0b..d1b6b5af0b 100644
--- a/chef/lib/chef/resource/log.rb
+++ b/lib/chef/resource/log.rb
diff --git a/chef/lib/chef/resource/macports_package.rb b/lib/chef/resource/macports_package.rb
index 911d3c19cb..911d3c19cb 100644
--- a/chef/lib/chef/resource/macports_package.rb
+++ b/lib/chef/resource/macports_package.rb
diff --git a/chef/lib/chef/resource/mdadm.rb b/lib/chef/resource/mdadm.rb
index 46a85b2475..46a85b2475 100644
--- a/chef/lib/chef/resource/mdadm.rb
+++ b/lib/chef/resource/mdadm.rb
diff --git a/chef/lib/chef/resource/mount.rb b/lib/chef/resource/mount.rb
index 8c32bdd280..8c32bdd280 100644
--- a/chef/lib/chef/resource/mount.rb
+++ b/lib/chef/resource/mount.rb
diff --git a/chef/lib/chef/resource/ohai.rb b/lib/chef/resource/ohai.rb
index 48e55e9f01..48e55e9f01 100644
--- a/chef/lib/chef/resource/ohai.rb
+++ b/lib/chef/resource/ohai.rb
diff --git a/chef/lib/chef/resource/package.rb b/lib/chef/resource/package.rb
index eaad3e2e58..eaad3e2e58 100644
--- a/chef/lib/chef/resource/package.rb
+++ b/lib/chef/resource/package.rb
diff --git a/chef/lib/chef/resource/pacman_package.rb b/lib/chef/resource/pacman_package.rb
index d66c93be66..d66c93be66 100644
--- a/chef/lib/chef/resource/pacman_package.rb
+++ b/lib/chef/resource/pacman_package.rb
diff --git a/chef/lib/chef/resource/perl.rb b/lib/chef/resource/perl.rb
index d3cf696cbb..d3cf696cbb 100644
--- a/chef/lib/chef/resource/perl.rb
+++ b/lib/chef/resource/perl.rb
diff --git a/chef/lib/chef/resource/portage_package.rb b/lib/chef/resource/portage_package.rb
index fc72381482..fc72381482 100644
--- a/chef/lib/chef/resource/portage_package.rb
+++ b/lib/chef/resource/portage_package.rb
diff --git a/chef/lib/chef/resource/python.rb b/lib/chef/resource/python.rb
index 85a5348d27..85a5348d27 100644
--- a/chef/lib/chef/resource/python.rb
+++ b/lib/chef/resource/python.rb
diff --git a/chef/lib/chef/resource/remote_directory.rb b/lib/chef/resource/remote_directory.rb
index 490e3c6ba7..490e3c6ba7 100644
--- a/chef/lib/chef/resource/remote_directory.rb
+++ b/lib/chef/resource/remote_directory.rb
diff --git a/chef/lib/chef/resource/remote_file.rb b/lib/chef/resource/remote_file.rb
index 2798cba3f2..2798cba3f2 100644
--- a/chef/lib/chef/resource/remote_file.rb
+++ b/lib/chef/resource/remote_file.rb
diff --git a/chef/lib/chef/resource/route.rb b/lib/chef/resource/route.rb
index cdd61f3a4b..cdd61f3a4b 100644
--- a/chef/lib/chef/resource/route.rb
+++ b/lib/chef/resource/route.rb
diff --git a/chef/lib/chef/resource/rpm_package.rb b/lib/chef/resource/rpm_package.rb
index 7ab1202ef2..7ab1202ef2 100644
--- a/chef/lib/chef/resource/rpm_package.rb
+++ b/lib/chef/resource/rpm_package.rb
diff --git a/chef/lib/chef/resource/ruby.rb b/lib/chef/resource/ruby.rb
index 7617839bab..7617839bab 100644
--- a/chef/lib/chef/resource/ruby.rb
+++ b/lib/chef/resource/ruby.rb
diff --git a/chef/lib/chef/resource/ruby_block.rb b/lib/chef/resource/ruby_block.rb
index 296345bde3..296345bde3 100644
--- a/chef/lib/chef/resource/ruby_block.rb
+++ b/lib/chef/resource/ruby_block.rb
diff --git a/chef/lib/chef/resource/scm.rb b/lib/chef/resource/scm.rb
index 781e09a2c9..781e09a2c9 100644
--- a/chef/lib/chef/resource/scm.rb
+++ b/lib/chef/resource/scm.rb
diff --git a/chef/lib/chef/resource/script.rb b/lib/chef/resource/script.rb
index 6a7c8e0d5e..6a7c8e0d5e 100644
--- a/chef/lib/chef/resource/script.rb
+++ b/lib/chef/resource/script.rb
diff --git a/chef/lib/chef/resource/service.rb b/lib/chef/resource/service.rb
index 3ace5cbec3..3ace5cbec3 100644
--- a/chef/lib/chef/resource/service.rb
+++ b/lib/chef/resource/service.rb
diff --git a/chef/lib/chef/resource/smartos_package.rb b/lib/chef/resource/smartos_package.rb
index 315481bd93..315481bd93 100644
--- a/chef/lib/chef/resource/smartos_package.rb
+++ b/lib/chef/resource/smartos_package.rb
diff --git a/chef/lib/chef/resource/solaris_package.rb b/lib/chef/resource/solaris_package.rb
index becf0236ad..becf0236ad 100644
--- a/chef/lib/chef/resource/solaris_package.rb
+++ b/lib/chef/resource/solaris_package.rb
diff --git a/chef/lib/chef/resource/subversion.rb b/lib/chef/resource/subversion.rb
index e3226d8b3b..e3226d8b3b 100644
--- a/chef/lib/chef/resource/subversion.rb
+++ b/lib/chef/resource/subversion.rb
diff --git a/chef/lib/chef/resource/template.rb b/lib/chef/resource/template.rb
index af51b64700..af51b64700 100644
--- a/chef/lib/chef/resource/template.rb
+++ b/lib/chef/resource/template.rb
diff --git a/chef/lib/chef/resource/timestamped_deploy.rb b/lib/chef/resource/timestamped_deploy.rb
index d89274bb44..d89274bb44 100644
--- a/chef/lib/chef/resource/timestamped_deploy.rb
+++ b/lib/chef/resource/timestamped_deploy.rb
diff --git a/chef/lib/chef/resource/user.rb b/lib/chef/resource/user.rb
index 4d8c4ac11b..4d8c4ac11b 100644
--- a/chef/lib/chef/resource/user.rb
+++ b/lib/chef/resource/user.rb
diff --git a/chef/lib/chef/resource/yum_package.rb b/lib/chef/resource/yum_package.rb
index bcb1f65667..bcb1f65667 100644
--- a/chef/lib/chef/resource/yum_package.rb
+++ b/lib/chef/resource/yum_package.rb
diff --git a/chef/lib/chef/resource_collection.rb b/lib/chef/resource_collection.rb
index 51858c53d8..51858c53d8 100644
--- a/chef/lib/chef/resource_collection.rb
+++ b/lib/chef/resource_collection.rb
diff --git a/chef/lib/chef/resource_collection/stepable_iterator.rb b/lib/chef/resource_collection/stepable_iterator.rb
index ec1e244758..ec1e244758 100644
--- a/chef/lib/chef/resource_collection/stepable_iterator.rb
+++ b/lib/chef/resource_collection/stepable_iterator.rb
diff --git a/chef/lib/chef/resource_definition.rb b/lib/chef/resource_definition.rb
index a0160c5885..a0160c5885 100644
--- a/chef/lib/chef/resource_definition.rb
+++ b/lib/chef/resource_definition.rb
diff --git a/chef/lib/chef/resource_definition_list.rb b/lib/chef/resource_definition_list.rb
index b958624208..b958624208 100644
--- a/chef/lib/chef/resource_definition_list.rb
+++ b/lib/chef/resource_definition_list.rb
diff --git a/chef/lib/chef/resource_platform_map.rb b/lib/chef/resource_platform_map.rb
index ad27aa91c1..ad27aa91c1 100644
--- a/chef/lib/chef/resource_platform_map.rb
+++ b/lib/chef/resource_platform_map.rb
diff --git a/chef/lib/chef/resource_reporter.rb b/lib/chef/resource_reporter.rb
index 3d10c1e961..3d10c1e961 100644
--- a/chef/lib/chef/resource_reporter.rb
+++ b/lib/chef/resource_reporter.rb
diff --git a/chef/lib/chef/resources.rb b/lib/chef/resources.rb
index 7fadb17444..7fadb17444 100644
--- a/chef/lib/chef/resources.rb
+++ b/lib/chef/resources.rb
diff --git a/chef/lib/chef/rest.rb b/lib/chef/rest.rb
index 1e67d762b3..1e67d762b3 100644
--- a/chef/lib/chef/rest.rb
+++ b/lib/chef/rest.rb
diff --git a/chef/lib/chef/rest/auth_credentials.rb b/lib/chef/rest/auth_credentials.rb
index 00711c960d..00711c960d 100644
--- a/chef/lib/chef/rest/auth_credentials.rb
+++ b/lib/chef/rest/auth_credentials.rb
diff --git a/chef/lib/chef/rest/cookie_jar.rb b/lib/chef/rest/cookie_jar.rb
index e3137708a2..e3137708a2 100644
--- a/chef/lib/chef/rest/cookie_jar.rb
+++ b/lib/chef/rest/cookie_jar.rb
diff --git a/chef/lib/chef/rest/rest_request.rb b/lib/chef/rest/rest_request.rb
index 4ff0016205..4ff0016205 100644
--- a/chef/lib/chef/rest/rest_request.rb
+++ b/lib/chef/rest/rest_request.rb
diff --git a/chef/lib/chef/role.rb b/lib/chef/role.rb
index 78bbfadb88..78bbfadb88 100644
--- a/chef/lib/chef/role.rb
+++ b/lib/chef/role.rb
diff --git a/chef/lib/chef/run_context.rb b/lib/chef/run_context.rb
index 625a993941..625a993941 100644
--- a/chef/lib/chef/run_context.rb
+++ b/lib/chef/run_context.rb
diff --git a/chef/lib/chef/run_list.rb b/lib/chef/run_list.rb
index 684c5e19fc..684c5e19fc 100644
--- a/chef/lib/chef/run_list.rb
+++ b/lib/chef/run_list.rb
diff --git a/chef/lib/chef/run_list/run_list_expansion.rb b/lib/chef/run_list/run_list_expansion.rb
index 7b8108a2d4..7b8108a2d4 100644
--- a/chef/lib/chef/run_list/run_list_expansion.rb
+++ b/lib/chef/run_list/run_list_expansion.rb
diff --git a/chef/lib/chef/run_list/run_list_item.rb b/lib/chef/run_list/run_list_item.rb
index 43bb239754..43bb239754 100644
--- a/chef/lib/chef/run_list/run_list_item.rb
+++ b/lib/chef/run_list/run_list_item.rb
diff --git a/chef/lib/chef/run_list/versioned_recipe_list.rb b/lib/chef/run_list/versioned_recipe_list.rb
index 0eefded964..0eefded964 100644
--- a/chef/lib/chef/run_list/versioned_recipe_list.rb
+++ b/lib/chef/run_list/versioned_recipe_list.rb
diff --git a/chef/lib/chef/run_lock.rb b/lib/chef/run_lock.rb
index ffe4d66045..ffe4d66045 100644
--- a/chef/lib/chef/run_lock.rb
+++ b/lib/chef/run_lock.rb
diff --git a/chef/lib/chef/run_status.rb b/lib/chef/run_status.rb
index 9354f7872a..9354f7872a 100644
--- a/chef/lib/chef/run_status.rb
+++ b/lib/chef/run_status.rb
diff --git a/chef/lib/chef/runner.rb b/lib/chef/runner.rb
index daa928e7a3..daa928e7a3 100644
--- a/chef/lib/chef/runner.rb
+++ b/lib/chef/runner.rb
diff --git a/chef/lib/chef/scan_access_control.rb b/lib/chef/scan_access_control.rb
index 5863a8c7c4..5863a8c7c4 100644
--- a/chef/lib/chef/scan_access_control.rb
+++ b/lib/chef/scan_access_control.rb
diff --git a/chef/lib/chef/search/query.rb b/lib/chef/search/query.rb
index d147bc0005..d147bc0005 100644
--- a/chef/lib/chef/search/query.rb
+++ b/lib/chef/search/query.rb
diff --git a/chef/lib/chef/shef/ext.rb b/lib/chef/shef/ext.rb
index 8f03de2d04..8f03de2d04 100644
--- a/chef/lib/chef/shef/ext.rb
+++ b/lib/chef/shef/ext.rb
diff --git a/chef/lib/chef/shell.rb b/lib/chef/shell.rb
index 0390cfaac5..0390cfaac5 100644
--- a/chef/lib/chef/shell.rb
+++ b/lib/chef/shell.rb
diff --git a/chef/lib/chef/shell/ext.rb b/lib/chef/shell/ext.rb
index 30d841e4cd..30d841e4cd 100644
--- a/chef/lib/chef/shell/ext.rb
+++ b/lib/chef/shell/ext.rb
diff --git a/chef/lib/chef/shell/model_wrapper.rb b/lib/chef/shell/model_wrapper.rb
index 7ee39de7eb..7ee39de7eb 100644
--- a/chef/lib/chef/shell/model_wrapper.rb
+++ b/lib/chef/shell/model_wrapper.rb
diff --git a/chef/lib/chef/shell/shell_rest.rb b/lib/chef/shell/shell_rest.rb
index a485a0a1a8..a485a0a1a8 100644
--- a/chef/lib/chef/shell/shell_rest.rb
+++ b/lib/chef/shell/shell_rest.rb
diff --git a/chef/lib/chef/shell/shell_session.rb b/lib/chef/shell/shell_session.rb
index 287cf0c166..287cf0c166 100644
--- a/chef/lib/chef/shell/shell_session.rb
+++ b/lib/chef/shell/shell_session.rb
diff --git a/chef/lib/chef/shell_out.rb b/lib/chef/shell_out.rb
index 3febe366bd..3febe366bd 100644
--- a/chef/lib/chef/shell_out.rb
+++ b/lib/chef/shell_out.rb
diff --git a/chef/lib/chef/streaming_cookbook_uploader.rb b/lib/chef/streaming_cookbook_uploader.rb
index df90e0003d..df90e0003d 100644
--- a/chef/lib/chef/streaming_cookbook_uploader.rb
+++ b/lib/chef/streaming_cookbook_uploader.rb
diff --git a/chef/lib/chef/tasks/chef_repo.rake b/lib/chef/tasks/chef_repo.rake
index 6f839a486f..6f839a486f 100644
--- a/chef/lib/chef/tasks/chef_repo.rake
+++ b/lib/chef/tasks/chef_repo.rake
diff --git a/chef/lib/chef/util/file_edit.rb b/lib/chef/util/file_edit.rb
index ce37bdcdbf..ce37bdcdbf 100644
--- a/chef/lib/chef/util/file_edit.rb
+++ b/lib/chef/util/file_edit.rb
diff --git a/chef/lib/chef/util/windows.rb b/lib/chef/util/windows.rb
index cba2c2a1b7..cba2c2a1b7 100644
--- a/chef/lib/chef/util/windows.rb
+++ b/lib/chef/util/windows.rb
diff --git a/chef/lib/chef/util/windows/net_group.rb b/lib/chef/util/windows/net_group.rb
index 9da0dc6557..9da0dc6557 100644
--- a/chef/lib/chef/util/windows/net_group.rb
+++ b/lib/chef/util/windows/net_group.rb
diff --git a/chef/lib/chef/util/windows/net_use.rb b/lib/chef/util/windows/net_use.rb
index 1979e095bd..1979e095bd 100644
--- a/chef/lib/chef/util/windows/net_use.rb
+++ b/lib/chef/util/windows/net_use.rb
diff --git a/chef/lib/chef/util/windows/net_user.rb b/lib/chef/util/windows/net_user.rb
index 97d8f33834..97d8f33834 100644
--- a/chef/lib/chef/util/windows/net_user.rb
+++ b/lib/chef/util/windows/net_user.rb
diff --git a/chef/lib/chef/util/windows/volume.rb b/lib/chef/util/windows/volume.rb
index 11f8e080b3..11f8e080b3 100644
--- a/chef/lib/chef/util/windows/volume.rb
+++ b/lib/chef/util/windows/volume.rb
diff --git a/chef/lib/chef/version.rb b/lib/chef/version.rb
index 929466a35a..929466a35a 100644
--- a/chef/lib/chef/version.rb
+++ b/lib/chef/version.rb
diff --git a/chef/lib/chef/version_class.rb b/lib/chef/version_class.rb
index e9879274ad..e9879274ad 100644
--- a/chef/lib/chef/version_class.rb
+++ b/lib/chef/version_class.rb
diff --git a/chef/lib/chef/version_constraint.rb b/lib/chef/version_constraint.rb
index b6f1f08757..b6f1f08757 100644
--- a/chef/lib/chef/version_constraint.rb
+++ b/lib/chef/version_constraint.rb
diff --git a/chef/lib/chef/win32/api.rb b/lib/chef/win32/api.rb
index 0330810b3b..0330810b3b 100644
--- a/chef/lib/chef/win32/api.rb
+++ b/lib/chef/win32/api.rb
diff --git a/chef/lib/chef/win32/api/error.rb b/lib/chef/win32/api/error.rb
index d1f9a309fe..d1f9a309fe 100644
--- a/chef/lib/chef/win32/api/error.rb
+++ b/lib/chef/win32/api/error.rb
diff --git a/chef/lib/chef/win32/api/file.rb b/lib/chef/win32/api/file.rb
index 41a128ea7e..41a128ea7e 100644
--- a/chef/lib/chef/win32/api/file.rb
+++ b/lib/chef/win32/api/file.rb
diff --git a/chef/lib/chef/win32/api/memory.rb b/lib/chef/win32/api/memory.rb
index abd1191718..abd1191718 100644
--- a/chef/lib/chef/win32/api/memory.rb
+++ b/lib/chef/win32/api/memory.rb
diff --git a/chef/lib/chef/win32/api/process.rb b/lib/chef/win32/api/process.rb
index d18ad411b4..d18ad411b4 100644
--- a/chef/lib/chef/win32/api/process.rb
+++ b/lib/chef/win32/api/process.rb
diff --git a/chef/lib/chef/win32/api/psapi.rb b/lib/chef/win32/api/psapi.rb
index 3a5df3f179..3a5df3f179 100644
--- a/chef/lib/chef/win32/api/psapi.rb
+++ b/lib/chef/win32/api/psapi.rb
diff --git a/chef/lib/chef/win32/api/security.rb b/lib/chef/win32/api/security.rb
index a096b40140..a096b40140 100644
--- a/chef/lib/chef/win32/api/security.rb
+++ b/lib/chef/win32/api/security.rb
diff --git a/chef/lib/chef/win32/api/system.rb b/lib/chef/win32/api/system.rb
index 60f381aa5a..60f381aa5a 100644
--- a/chef/lib/chef/win32/api/system.rb
+++ b/lib/chef/win32/api/system.rb
diff --git a/chef/lib/chef/win32/api/unicode.rb b/lib/chef/win32/api/unicode.rb
index 0b2cb09a6b..0b2cb09a6b 100644
--- a/chef/lib/chef/win32/api/unicode.rb
+++ b/lib/chef/win32/api/unicode.rb
diff --git a/chef/lib/chef/win32/error.rb b/lib/chef/win32/error.rb
index 716ca99d01..716ca99d01 100644
--- a/chef/lib/chef/win32/error.rb
+++ b/lib/chef/win32/error.rb
diff --git a/chef/lib/chef/win32/file.rb b/lib/chef/win32/file.rb
index d489c9ce8a..d489c9ce8a 100644
--- a/chef/lib/chef/win32/file.rb
+++ b/lib/chef/win32/file.rb
diff --git a/chef/lib/chef/win32/file/info.rb b/lib/chef/win32/file/info.rb
index 0f07428106..0f07428106 100644
--- a/chef/lib/chef/win32/file/info.rb
+++ b/lib/chef/win32/file/info.rb
diff --git a/chef/lib/chef/win32/handle.rb b/lib/chef/win32/handle.rb
index 60e35916ad..60e35916ad 100644
--- a/chef/lib/chef/win32/handle.rb
+++ b/lib/chef/win32/handle.rb
diff --git a/chef/lib/chef/win32/memory.rb b/lib/chef/win32/memory.rb
index 8a61d27ef0..8a61d27ef0 100644
--- a/chef/lib/chef/win32/memory.rb
+++ b/lib/chef/win32/memory.rb
diff --git a/chef/lib/chef/win32/process.rb b/lib/chef/win32/process.rb
index 2df39bb918..2df39bb918 100644
--- a/chef/lib/chef/win32/process.rb
+++ b/lib/chef/win32/process.rb
diff --git a/chef/lib/chef/win32/security.rb b/lib/chef/win32/security.rb
index b7b14c5652..b7b14c5652 100644
--- a/chef/lib/chef/win32/security.rb
+++ b/lib/chef/win32/security.rb
diff --git a/chef/lib/chef/win32/security/ace.rb b/lib/chef/win32/security/ace.rb
index efd44b1c85..efd44b1c85 100644
--- a/chef/lib/chef/win32/security/ace.rb
+++ b/lib/chef/win32/security/ace.rb
diff --git a/chef/lib/chef/win32/security/acl.rb b/lib/chef/win32/security/acl.rb
index fd43b75cbf..fd43b75cbf 100644
--- a/chef/lib/chef/win32/security/acl.rb
+++ b/lib/chef/win32/security/acl.rb
diff --git a/chef/lib/chef/win32/security/securable_object.rb b/lib/chef/win32/security/securable_object.rb
index 00655c9bab..00655c9bab 100644
--- a/chef/lib/chef/win32/security/securable_object.rb
+++ b/lib/chef/win32/security/securable_object.rb
diff --git a/chef/lib/chef/win32/security/security_descriptor.rb b/lib/chef/win32/security/security_descriptor.rb
index 658e9104b4..658e9104b4 100644
--- a/chef/lib/chef/win32/security/security_descriptor.rb
+++ b/lib/chef/win32/security/security_descriptor.rb
diff --git a/chef/lib/chef/win32/security/sid.rb b/lib/chef/win32/security/sid.rb
index 7ca21eee79..7ca21eee79 100644
--- a/chef/lib/chef/win32/security/sid.rb
+++ b/lib/chef/win32/security/sid.rb
diff --git a/chef/lib/chef/win32/security/token.rb b/lib/chef/win32/security/token.rb
index ded4fc080e..ded4fc080e 100644
--- a/chef/lib/chef/win32/security/token.rb
+++ b/lib/chef/win32/security/token.rb
diff --git a/chef/lib/chef/win32/unicode.rb b/lib/chef/win32/unicode.rb
index 1002a4d58f..1002a4d58f 100644
--- a/chef/lib/chef/win32/unicode.rb
+++ b/lib/chef/win32/unicode.rb
diff --git a/chef/lib/chef/win32/version.rb b/lib/chef/win32/version.rb
index 004fcad5ad..004fcad5ad 100644
--- a/chef/lib/chef/win32/version.rb
+++ b/lib/chef/win32/version.rb
diff --git a/chef/spec/data/bad-config.rb b/spec/data/bad-config.rb
index 5477a69366..5477a69366 100644
--- a/chef/spec/data/bad-config.rb
+++ b/spec/data/bad-config.rb
diff --git a/chef/spec/data/big_json.json b/spec/data/big_json.json
index 8e095bc148..8e095bc148 100644
--- a/chef/spec/data/big_json.json
+++ b/spec/data/big_json.json
diff --git a/chef/spec/data/big_json_plus_one.json b/spec/data/big_json_plus_one.json
index 973f7fae50..973f7fae50 100644
--- a/chef/spec/data/big_json_plus_one.json
+++ b/spec/data/big_json_plus_one.json
diff --git a/chef/spec/data/bootstrap/test-hints.erb b/spec/data/bootstrap/test-hints.erb
index 29ba710b42..29ba710b42 100644
--- a/chef/spec/data/bootstrap/test-hints.erb
+++ b/spec/data/bootstrap/test-hints.erb
diff --git a/chef/spec/data/bootstrap/test.erb b/spec/data/bootstrap/test.erb
index 7cdc7dfdd0..7cdc7dfdd0 100644
--- a/chef/spec/data/bootstrap/test.erb
+++ b/spec/data/bootstrap/test.erb
diff --git a/chef/spec/data/cb_version_cookbooks/tatft/README.rdoc b/spec/data/cb_version_cookbooks/tatft/README.rdoc
index 460d96b40d..460d96b40d 100644
--- a/chef/spec/data/cb_version_cookbooks/tatft/README.rdoc
+++ b/spec/data/cb_version_cookbooks/tatft/README.rdoc
diff --git a/chef/spec/data/cb_version_cookbooks/tatft/attributes/default.rb b/spec/data/cb_version_cookbooks/tatft/attributes/default.rb
index 47774459c2..47774459c2 100644
--- a/chef/spec/data/cb_version_cookbooks/tatft/attributes/default.rb
+++ b/spec/data/cb_version_cookbooks/tatft/attributes/default.rb
diff --git a/chef/spec/data/cb_version_cookbooks/tatft/definitions/runit_service.rb b/spec/data/cb_version_cookbooks/tatft/definitions/runit_service.rb
index 3912b37365..3912b37365 100644
--- a/chef/spec/data/cb_version_cookbooks/tatft/definitions/runit_service.rb
+++ b/spec/data/cb_version_cookbooks/tatft/definitions/runit_service.rb
diff --git a/chef/spec/data/cb_version_cookbooks/tatft/files/default/giant_blob.tgz b/spec/data/cb_version_cookbooks/tatft/files/default/giant_blob.tgz
index 3e7496601e..3e7496601e 100644
--- a/chef/spec/data/cb_version_cookbooks/tatft/files/default/giant_blob.tgz
+++ b/spec/data/cb_version_cookbooks/tatft/files/default/giant_blob.tgz
diff --git a/chef/spec/data/cb_version_cookbooks/tatft/libraries/ownage.rb b/spec/data/cb_version_cookbooks/tatft/libraries/ownage.rb
index fea05ba67b..fea05ba67b 100644
--- a/chef/spec/data/cb_version_cookbooks/tatft/libraries/ownage.rb
+++ b/spec/data/cb_version_cookbooks/tatft/libraries/ownage.rb
diff --git a/chef/spec/data/cb_version_cookbooks/tatft/providers/lwp.rb b/spec/data/cb_version_cookbooks/tatft/providers/lwp.rb
index 977ad19192..977ad19192 100644
--- a/chef/spec/data/cb_version_cookbooks/tatft/providers/lwp.rb
+++ b/spec/data/cb_version_cookbooks/tatft/providers/lwp.rb
diff --git a/chef/spec/data/cb_version_cookbooks/tatft/recipes/default.rb b/spec/data/cb_version_cookbooks/tatft/recipes/default.rb
index 48eacf848b..48eacf848b 100644
--- a/chef/spec/data/cb_version_cookbooks/tatft/recipes/default.rb
+++ b/spec/data/cb_version_cookbooks/tatft/recipes/default.rb
diff --git a/chef/spec/data/cb_version_cookbooks/tatft/resources/lwr.rb b/spec/data/cb_version_cookbooks/tatft/resources/lwr.rb
index 987114f4ca..987114f4ca 100644
--- a/chef/spec/data/cb_version_cookbooks/tatft/resources/lwr.rb
+++ b/spec/data/cb_version_cookbooks/tatft/resources/lwr.rb
diff --git a/chef/spec/data/cb_version_cookbooks/tatft/templates/default/configuration.erb b/spec/data/cb_version_cookbooks/tatft/templates/default/configuration.erb
index e69de29bb2..e69de29bb2 100644
--- a/chef/spec/data/cb_version_cookbooks/tatft/templates/default/configuration.erb
+++ b/spec/data/cb_version_cookbooks/tatft/templates/default/configuration.erb
diff --git a/chef/spec/data/checksum/random.txt b/spec/data/checksum/random.txt
index 9570fff833..9570fff833 100644
--- a/chef/spec/data/checksum/random.txt
+++ b/spec/data/checksum/random.txt
diff --git a/chef/spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-600hhz-0 b/spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-600hhz-0
index 81836588d5..81836588d5 100644
--- a/chef/spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-600hhz-0
+++ b/spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-600hhz-0
diff --git a/chef/spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-6m8zdk-0 b/spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-6m8zdk-0
index e69de29bb2..e69de29bb2 100644
--- a/chef/spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-6m8zdk-0
+++ b/spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-6m8zdk-0
diff --git a/chef/spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-ahd2gq-0 b/spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-ahd2gq-0
index 81836588d5..81836588d5 100644
--- a/chef/spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-ahd2gq-0
+++ b/spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-ahd2gq-0
diff --git a/chef/spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-api8ux-0 b/spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-api8ux-0
index 81836588d5..81836588d5 100644
--- a/chef/spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-api8ux-0
+++ b/spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-api8ux-0
diff --git a/chef/spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-b0r1m1-0 b/spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-b0r1m1-0
index 81836588d5..81836588d5 100644
--- a/chef/spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-b0r1m1-0
+++ b/spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-b0r1m1-0
diff --git a/chef/spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-bfygsi-0 b/spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-bfygsi-0
index 81836588d5..81836588d5 100644
--- a/chef/spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-bfygsi-0
+++ b/spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-bfygsi-0
diff --git a/chef/spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-el14l6-0 b/spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-el14l6-0
index 81836588d5..81836588d5 100644
--- a/chef/spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-el14l6-0
+++ b/spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-el14l6-0
diff --git a/chef/spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-ivrl3y-0 b/spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-ivrl3y-0
index 81836588d5..81836588d5 100644
--- a/chef/spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-ivrl3y-0
+++ b/spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-ivrl3y-0
diff --git a/chef/spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-kkbs85-0 b/spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-kkbs85-0
index 81836588d5..81836588d5 100644
--- a/chef/spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-kkbs85-0
+++ b/spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-kkbs85-0
diff --git a/chef/spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-ory1ux-0 b/spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-ory1ux-0
index 81836588d5..81836588d5 100644
--- a/chef/spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-ory1ux-0
+++ b/spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-ory1ux-0
diff --git a/chef/spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-pgsq76-0 b/spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-pgsq76-0
index 81836588d5..81836588d5 100644
--- a/chef/spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-pgsq76-0
+++ b/spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-pgsq76-0
diff --git a/chef/spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-ra8uim-0 b/spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-ra8uim-0
index 81836588d5..81836588d5 100644
--- a/chef/spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-ra8uim-0
+++ b/spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-ra8uim-0
diff --git a/chef/spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-t7k1g-0 b/spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-t7k1g-0
index 81836588d5..81836588d5 100644
--- a/chef/spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-t7k1g-0
+++ b/spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-t7k1g-0
diff --git a/chef/spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-t8g0sv-0 b/spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-t8g0sv-0
index 81836588d5..81836588d5 100644
--- a/chef/spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-t8g0sv-0
+++ b/spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-t8g0sv-0
diff --git a/chef/spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-ufy6g3-0 b/spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-ufy6g3-0
index 81836588d5..81836588d5 100644
--- a/chef/spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-ufy6g3-0
+++ b/spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-ufy6g3-0
diff --git a/chef/spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-x2d6j9-0 b/spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-x2d6j9-0
index 81836588d5..81836588d5 100644
--- a/chef/spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-x2d6j9-0
+++ b/spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-x2d6j9-0
diff --git a/chef/spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-xi0l6h-0 b/spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-xi0l6h-0
index 81836588d5..81836588d5 100644
--- a/chef/spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-xi0l6h-0
+++ b/spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-xi0l6h-0
diff --git a/chef/spec/data/config.rb b/spec/data/config.rb
index 0b3340ce57..0b3340ce57 100644
--- a/chef/spec/data/config.rb
+++ b/spec/data/config.rb
diff --git a/chef/spec/data/cookbooks/angrybash/recipes/default.rb b/spec/data/cookbooks/angrybash/recipes/default.rb
index 458a29103e..458a29103e 100644
--- a/chef/spec/data/cookbooks/angrybash/recipes/default.rb
+++ b/spec/data/cookbooks/angrybash/recipes/default.rb
diff --git a/chef/spec/data/cookbooks/apache2/files/default/apache2_module_conf_generate.pl b/spec/data/cookbooks/apache2/files/default/apache2_module_conf_generate.pl
index 6cce6229c4..6cce6229c4 100644
--- a/chef/spec/data/cookbooks/apache2/files/default/apache2_module_conf_generate.pl
+++ b/spec/data/cookbooks/apache2/files/default/apache2_module_conf_generate.pl
diff --git a/chef/spec/data/cookbooks/apache2/recipes/default.rb b/spec/data/cookbooks/apache2/recipes/default.rb
index c2fa53be32..c2fa53be32 100644
--- a/chef/spec/data/cookbooks/apache2/recipes/default.rb
+++ b/spec/data/cookbooks/apache2/recipes/default.rb
diff --git a/chef/spec/data/cookbooks/borken/recipes/default.rb b/spec/data/cookbooks/borken/recipes/default.rb
index caf40b3974..caf40b3974 100644
--- a/chef/spec/data/cookbooks/borken/recipes/default.rb
+++ b/spec/data/cookbooks/borken/recipes/default.rb
diff --git a/chef/spec/data/cookbooks/borken/templates/default/borken.erb b/spec/data/cookbooks/borken/templates/default/borken.erb
index cbb32c1cd7..cbb32c1cd7 100644
--- a/chef/spec/data/cookbooks/borken/templates/default/borken.erb
+++ b/spec/data/cookbooks/borken/templates/default/borken.erb
diff --git a/chef/spec/data/cookbooks/chefignore b/spec/data/cookbooks/chefignore
index cfd4e65832..cfd4e65832 100644
--- a/chef/spec/data/cookbooks/chefignore
+++ b/spec/data/cookbooks/chefignore
diff --git a/chef/spec/data/cookbooks/java/files/default/java.response b/spec/data/cookbooks/java/files/default/java.response
index eb4aa3c124..eb4aa3c124 100644
--- a/chef/spec/data/cookbooks/java/files/default/java.response
+++ b/spec/data/cookbooks/java/files/default/java.response
diff --git a/chef/spec/data/cookbooks/openldap/attributes/default.rb b/spec/data/cookbooks/openldap/attributes/default.rb
index d0756f17e3..d0756f17e3 100644
--- a/chef/spec/data/cookbooks/openldap/attributes/default.rb
+++ b/spec/data/cookbooks/openldap/attributes/default.rb
diff --git a/chef/spec/data/cookbooks/openldap/attributes/smokey.rb b/spec/data/cookbooks/openldap/attributes/smokey.rb
index 4489c6a7ac..4489c6a7ac 100644
--- a/chef/spec/data/cookbooks/openldap/attributes/smokey.rb
+++ b/spec/data/cookbooks/openldap/attributes/smokey.rb
diff --git a/chef/spec/data/cookbooks/openldap/definitions/client.rb b/spec/data/cookbooks/openldap/definitions/client.rb
index ac81831d11..ac81831d11 100644
--- a/chef/spec/data/cookbooks/openldap/definitions/client.rb
+++ b/spec/data/cookbooks/openldap/definitions/client.rb
diff --git a/chef/spec/data/cookbooks/openldap/definitions/server.rb b/spec/data/cookbooks/openldap/definitions/server.rb
index 2df437aa84..2df437aa84 100644
--- a/chef/spec/data/cookbooks/openldap/definitions/server.rb
+++ b/spec/data/cookbooks/openldap/definitions/server.rb
diff --git a/chef/spec/data/cookbooks/openldap/files/default/.dotfile b/spec/data/cookbooks/openldap/files/default/.dotfile
index 35ae928f91..35ae928f91 100644
--- a/chef/spec/data/cookbooks/openldap/files/default/.dotfile
+++ b/spec/data/cookbooks/openldap/files/default/.dotfile
diff --git a/chef/spec/data/cookbooks/openldap/files/default/.ssh/id_rsa b/spec/data/cookbooks/openldap/files/default/.ssh/id_rsa
index 20a3ea410a..20a3ea410a 100644
--- a/chef/spec/data/cookbooks/openldap/files/default/.ssh/id_rsa
+++ b/spec/data/cookbooks/openldap/files/default/.ssh/id_rsa
diff --git a/chef/spec/data/cookbooks/openldap/files/default/remotedir/.a_dotdir/.a_dotfile_in_a_dotdir b/spec/data/cookbooks/openldap/files/default/remotedir/.a_dotdir/.a_dotfile_in_a_dotdir
index f44a956c15..f44a956c15 100644
--- a/chef/spec/data/cookbooks/openldap/files/default/remotedir/.a_dotdir/.a_dotfile_in_a_dotdir
+++ b/spec/data/cookbooks/openldap/files/default/remotedir/.a_dotdir/.a_dotfile_in_a_dotdir
diff --git a/chef/spec/data/cookbooks/openldap/files/default/remotedir/remote_dir_file1.txt b/spec/data/cookbooks/openldap/files/default/remotedir/remote_dir_file1.txt
index 7632730912..7632730912 100644
--- a/chef/spec/data/cookbooks/openldap/files/default/remotedir/remote_dir_file1.txt
+++ b/spec/data/cookbooks/openldap/files/default/remotedir/remote_dir_file1.txt
diff --git a/chef/spec/data/cookbooks/openldap/files/default/remotedir/remote_dir_file2.txt b/spec/data/cookbooks/openldap/files/default/remotedir/remote_dir_file2.txt
index fab0433922..fab0433922 100644
--- a/chef/spec/data/cookbooks/openldap/files/default/remotedir/remote_dir_file2.txt
+++ b/spec/data/cookbooks/openldap/files/default/remotedir/remote_dir_file2.txt
diff --git a/chef/spec/data/cookbooks/openldap/files/default/remotedir/remotesubdir/.a_dotfile b/spec/data/cookbooks/openldap/files/default/remotedir/remotesubdir/.a_dotfile
index 9a2b2a4b5f..9a2b2a4b5f 100644
--- a/chef/spec/data/cookbooks/openldap/files/default/remotedir/remotesubdir/.a_dotfile
+++ b/spec/data/cookbooks/openldap/files/default/remotedir/remotesubdir/.a_dotfile
diff --git a/chef/spec/data/cookbooks/openldap/files/default/remotedir/remotesubdir/remote_subdir_file1.txt b/spec/data/cookbooks/openldap/files/default/remotedir/remotesubdir/remote_subdir_file1.txt
index 611294cb81..611294cb81 100644
--- a/chef/spec/data/cookbooks/openldap/files/default/remotedir/remotesubdir/remote_subdir_file1.txt
+++ b/spec/data/cookbooks/openldap/files/default/remotedir/remotesubdir/remote_subdir_file1.txt
diff --git a/chef/spec/data/cookbooks/openldap/files/default/remotedir/remotesubdir/remote_subdir_file2.txt b/spec/data/cookbooks/openldap/files/default/remotedir/remotesubdir/remote_subdir_file2.txt
index e0396542a4..e0396542a4 100644
--- a/chef/spec/data/cookbooks/openldap/files/default/remotedir/remotesubdir/remote_subdir_file2.txt
+++ b/spec/data/cookbooks/openldap/files/default/remotedir/remotesubdir/remote_subdir_file2.txt
diff --git a/chef/spec/data/cookbooks/openldap/files/default/remotedir/subdir_with_no_file_just_a_subsubdir/the_subsubdir/some_file.txt b/spec/data/cookbooks/openldap/files/default/remotedir/subdir_with_no_file_just_a_subsubdir/the_subsubdir/some_file.txt
index bc47369aad..bc47369aad 100644
--- a/chef/spec/data/cookbooks/openldap/files/default/remotedir/subdir_with_no_file_just_a_subsubdir/the_subsubdir/some_file.txt
+++ b/spec/data/cookbooks/openldap/files/default/remotedir/subdir_with_no_file_just_a_subsubdir/the_subsubdir/some_file.txt
diff --git a/chef/spec/data/cookbooks/openldap/recipes/default.rb b/spec/data/cookbooks/openldap/recipes/default.rb
index 0ac8a9bb4b..0ac8a9bb4b 100644
--- a/chef/spec/data/cookbooks/openldap/recipes/default.rb
+++ b/spec/data/cookbooks/openldap/recipes/default.rb
diff --git a/chef/spec/data/cookbooks/openldap/recipes/gigantor.rb b/spec/data/cookbooks/openldap/recipes/gigantor.rb
index b450eca7cd..b450eca7cd 100644
--- a/chef/spec/data/cookbooks/openldap/recipes/gigantor.rb
+++ b/spec/data/cookbooks/openldap/recipes/gigantor.rb
diff --git a/chef/spec/data/cookbooks/openldap/recipes/one.rb b/spec/data/cookbooks/openldap/recipes/one.rb
index d2d3cfd409..d2d3cfd409 100644
--- a/chef/spec/data/cookbooks/openldap/recipes/one.rb
+++ b/spec/data/cookbooks/openldap/recipes/one.rb
diff --git a/chef/spec/data/cookbooks/openldap/templates/default/openldap_stuff.conf.erb b/spec/data/cookbooks/openldap/templates/default/openldap_stuff.conf.erb
index af82f1d96c..af82f1d96c 100644
--- a/chef/spec/data/cookbooks/openldap/templates/default/openldap_stuff.conf.erb
+++ b/spec/data/cookbooks/openldap/templates/default/openldap_stuff.conf.erb
diff --git a/chef/spec/data/cookbooks/openldap/templates/default/openldap_variable_stuff.conf.erb b/spec/data/cookbooks/openldap/templates/default/openldap_variable_stuff.conf.erb
index e0041c9f99..e0041c9f99 100644
--- a/chef/spec/data/cookbooks/openldap/templates/default/openldap_variable_stuff.conf.erb
+++ b/spec/data/cookbooks/openldap/templates/default/openldap_variable_stuff.conf.erb
diff --git a/chef/spec/data/cookbooks/openldap/templates/default/test.erb b/spec/data/cookbooks/openldap/templates/default/test.erb
index f39fa7da89..f39fa7da89 100644
--- a/chef/spec/data/cookbooks/openldap/templates/default/test.erb
+++ b/spec/data/cookbooks/openldap/templates/default/test.erb
diff --git a/chef/spec/data/definitions/test.rb b/spec/data/definitions/test.rb
index b0d0effc27..b0d0effc27 100644
--- a/chef/spec/data/definitions/test.rb
+++ b/spec/data/definitions/test.rb
diff --git a/chef/spec/data/environment-config.rb b/spec/data/environment-config.rb
index a157ecf0ea..a157ecf0ea 100644
--- a/chef/spec/data/environment-config.rb
+++ b/spec/data/environment-config.rb
diff --git a/chef/spec/data/fileedit/blank b/spec/data/fileedit/blank
index e69de29bb2..e69de29bb2 100644
--- a/chef/spec/data/fileedit/blank
+++ b/spec/data/fileedit/blank
diff --git a/chef/spec/data/fileedit/hosts b/spec/data/fileedit/hosts
index 6fbdc0f59d..6fbdc0f59d 100644
--- a/chef/spec/data/fileedit/hosts
+++ b/spec/data/fileedit/hosts
diff --git a/chef/spec/data/gems/chef-integration-test-0.1.0.gem b/spec/data/gems/chef-integration-test-0.1.0.gem
index bcf1c77fe2..bcf1c77fe2 100644
--- a/chef/spec/data/gems/chef-integration-test-0.1.0.gem
+++ b/spec/data/gems/chef-integration-test-0.1.0.gem
diff --git a/chef/spec/data/kitchen/chefignore b/spec/data/kitchen/chefignore
index a90dc15ebe..a90dc15ebe 100644
--- a/chef/spec/data/kitchen/chefignore
+++ b/spec/data/kitchen/chefignore
diff --git a/chef/spec/data/kitchen/openldap/attributes/default.rb b/spec/data/kitchen/openldap/attributes/default.rb
index d208959475..d208959475 100644
--- a/chef/spec/data/kitchen/openldap/attributes/default.rb
+++ b/spec/data/kitchen/openldap/attributes/default.rb
diff --git a/chef/spec/data/kitchen/openldap/attributes/robinson.rb b/spec/data/kitchen/openldap/attributes/robinson.rb
index 9d6b44d464..9d6b44d464 100644
--- a/chef/spec/data/kitchen/openldap/attributes/robinson.rb
+++ b/spec/data/kitchen/openldap/attributes/robinson.rb
diff --git a/chef/spec/data/kitchen/openldap/definitions/client.rb b/spec/data/kitchen/openldap/definitions/client.rb
index d4c2263b54..d4c2263b54 100644
--- a/chef/spec/data/kitchen/openldap/definitions/client.rb
+++ b/spec/data/kitchen/openldap/definitions/client.rb
diff --git a/chef/spec/data/kitchen/openldap/definitions/drewbarrymore.rb b/spec/data/kitchen/openldap/definitions/drewbarrymore.rb
index 510f0c35da..510f0c35da 100644
--- a/chef/spec/data/kitchen/openldap/definitions/drewbarrymore.rb
+++ b/spec/data/kitchen/openldap/definitions/drewbarrymore.rb
diff --git a/chef/spec/data/kitchen/openldap/recipes/gigantor.rb b/spec/data/kitchen/openldap/recipes/gigantor.rb
index 70a41960eb..70a41960eb 100644
--- a/chef/spec/data/kitchen/openldap/recipes/gigantor.rb
+++ b/spec/data/kitchen/openldap/recipes/gigantor.rb
diff --git a/chef/spec/data/kitchen/openldap/recipes/ignoreme.rb b/spec/data/kitchen/openldap/recipes/ignoreme.rb
index 15095986c6..15095986c6 100644
--- a/chef/spec/data/kitchen/openldap/recipes/ignoreme.rb
+++ b/spec/data/kitchen/openldap/recipes/ignoreme.rb
diff --git a/chef/spec/data/kitchen/openldap/recipes/woot.rb b/spec/data/kitchen/openldap/recipes/woot.rb
index 44893dae36..44893dae36 100644
--- a/chef/spec/data/kitchen/openldap/recipes/woot.rb
+++ b/spec/data/kitchen/openldap/recipes/woot.rb
diff --git a/chef/spec/data/knife-home/.chef/plugins/knife/example_home_subcommand.rb b/spec/data/knife-home/.chef/plugins/knife/example_home_subcommand.rb
index e69de29bb2..e69de29bb2 100644
--- a/chef/spec/data/knife-home/.chef/plugins/knife/example_home_subcommand.rb
+++ b/spec/data/knife-home/.chef/plugins/knife/example_home_subcommand.rb
diff --git a/chef/spec/data/knife-site-subcommands/plugins/knife/example_subcommand.rb b/spec/data/knife-site-subcommands/plugins/knife/example_subcommand.rb
index e69de29bb2..e69de29bb2 100644
--- a/chef/spec/data/knife-site-subcommands/plugins/knife/example_subcommand.rb
+++ b/spec/data/knife-site-subcommands/plugins/knife/example_subcommand.rb
diff --git a/chef/spec/data/knife_subcommand/test_explicit_category.rb b/spec/data/knife_subcommand/test_explicit_category.rb
index 96d50691a1..96d50691a1 100644
--- a/chef/spec/data/knife_subcommand/test_explicit_category.rb
+++ b/spec/data/knife_subcommand/test_explicit_category.rb
diff --git a/chef/spec/data/knife_subcommand/test_name_mapping.rb b/spec/data/knife_subcommand/test_name_mapping.rb
index 25c49b0df0..25c49b0df0 100644
--- a/chef/spec/data/knife_subcommand/test_name_mapping.rb
+++ b/spec/data/knife_subcommand/test_name_mapping.rb
diff --git a/chef/spec/data/knife_subcommand/test_yourself.rb b/spec/data/knife_subcommand/test_yourself.rb
index 4b3f6b039c..4b3f6b039c 100644
--- a/chef/spec/data/knife_subcommand/test_yourself.rb
+++ b/spec/data/knife_subcommand/test_yourself.rb
diff --git a/chef/spec/data/lwrp/providers/buck_passer.rb b/spec/data/lwrp/providers/buck_passer.rb
index 1f83e5098b..1f83e5098b 100644
--- a/chef/spec/data/lwrp/providers/buck_passer.rb
+++ b/spec/data/lwrp/providers/buck_passer.rb
diff --git a/chef/spec/data/lwrp/providers/buck_passer_2.rb b/spec/data/lwrp/providers/buck_passer_2.rb
index d34da3c378..d34da3c378 100644
--- a/chef/spec/data/lwrp/providers/buck_passer_2.rb
+++ b/spec/data/lwrp/providers/buck_passer_2.rb
diff --git a/chef/spec/data/lwrp/providers/embedded_resource_accesses_providers_scope.rb b/spec/data/lwrp/providers/embedded_resource_accesses_providers_scope.rb
index f5841fb01c..f5841fb01c 100644
--- a/chef/spec/data/lwrp/providers/embedded_resource_accesses_providers_scope.rb
+++ b/spec/data/lwrp/providers/embedded_resource_accesses_providers_scope.rb
diff --git a/chef/spec/data/lwrp/providers/monkey_name_printer.rb b/spec/data/lwrp/providers/monkey_name_printer.rb
index 97ca66c65d..97ca66c65d 100644
--- a/chef/spec/data/lwrp/providers/monkey_name_printer.rb
+++ b/spec/data/lwrp/providers/monkey_name_printer.rb
diff --git a/chef/spec/data/lwrp/providers/paint_drying_watcher.rb b/spec/data/lwrp/providers/paint_drying_watcher.rb
index 04b4732dcc..04b4732dcc 100644
--- a/chef/spec/data/lwrp/providers/paint_drying_watcher.rb
+++ b/spec/data/lwrp/providers/paint_drying_watcher.rb
diff --git a/chef/spec/data/lwrp/providers/thumb_twiddler.rb b/spec/data/lwrp/providers/thumb_twiddler.rb
index 7f014615db..7f014615db 100644
--- a/chef/spec/data/lwrp/providers/thumb_twiddler.rb
+++ b/spec/data/lwrp/providers/thumb_twiddler.rb
diff --git a/chef/spec/data/lwrp/resources/bar.rb b/spec/data/lwrp/resources/bar.rb
index bded6eeac3..bded6eeac3 100644
--- a/chef/spec/data/lwrp/resources/bar.rb
+++ b/spec/data/lwrp/resources/bar.rb
diff --git a/chef/spec/data/lwrp/resources/foo.rb b/spec/data/lwrp/resources/foo.rb
index c881c80530..c881c80530 100644
--- a/chef/spec/data/lwrp/resources/foo.rb
+++ b/spec/data/lwrp/resources/foo.rb
diff --git a/chef/spec/data/lwrp/resources_with_default_attributes/nodeattr.rb b/spec/data/lwrp/resources_with_default_attributes/nodeattr.rb
index dece7c4eab..dece7c4eab 100644
--- a/chef/spec/data/lwrp/resources_with_default_attributes/nodeattr.rb
+++ b/spec/data/lwrp/resources_with_default_attributes/nodeattr.rb
diff --git a/chef/spec/data/lwrp_override/providers/buck_passer.rb b/spec/data/lwrp_override/providers/buck_passer.rb
index 75917a58c9..75917a58c9 100644
--- a/chef/spec/data/lwrp_override/providers/buck_passer.rb
+++ b/spec/data/lwrp_override/providers/buck_passer.rb
diff --git a/chef/spec/data/lwrp_override/resources/foo.rb b/spec/data/lwrp_override/resources/foo.rb
index 0ee83f0cd0..0ee83f0cd0 100644
--- a/chef/spec/data/lwrp_override/resources/foo.rb
+++ b/spec/data/lwrp_override/resources/foo.rb
diff --git a/chef/spec/data/metadata/quick_start/metadata.rb b/spec/data/metadata/quick_start/metadata.rb
index e74eedba0f..e74eedba0f 100644
--- a/chef/spec/data/metadata/quick_start/metadata.rb
+++ b/spec/data/metadata/quick_start/metadata.rb
diff --git a/chef/spec/data/nodes/default.rb b/spec/data/nodes/default.rb
index 1d6291f166..1d6291f166 100644
--- a/chef/spec/data/nodes/default.rb
+++ b/spec/data/nodes/default.rb
diff --git a/chef/spec/data/nodes/test.example.com.rb b/spec/data/nodes/test.example.com.rb
index b30e8489e0..b30e8489e0 100644
--- a/chef/spec/data/nodes/test.example.com.rb
+++ b/spec/data/nodes/test.example.com.rb
diff --git a/chef/spec/data/nodes/test.rb b/spec/data/nodes/test.rb
index e1301130d2..e1301130d2 100644
--- a/chef/spec/data/nodes/test.rb
+++ b/spec/data/nodes/test.rb
diff --git a/chef/spec/data/object_loader/environments/test.json b/spec/data/object_loader/environments/test.json
index cb4c790e44..cb4c790e44 100644
--- a/chef/spec/data/object_loader/environments/test.json
+++ b/spec/data/object_loader/environments/test.json
diff --git a/chef/spec/data/object_loader/environments/test.rb b/spec/data/object_loader/environments/test.rb
index 8bf4ee52e0..8bf4ee52e0 100644
--- a/chef/spec/data/object_loader/environments/test.rb
+++ b/spec/data/object_loader/environments/test.rb
diff --git a/chef/spec/data/object_loader/environments/test_json_class.json b/spec/data/object_loader/environments/test_json_class.json
index 28345198c9..28345198c9 100644
--- a/chef/spec/data/object_loader/environments/test_json_class.json
+++ b/spec/data/object_loader/environments/test_json_class.json
diff --git a/chef/spec/data/object_loader/nodes/test.json b/spec/data/object_loader/nodes/test.json
index 49f297d039..49f297d039 100644
--- a/chef/spec/data/object_loader/nodes/test.json
+++ b/spec/data/object_loader/nodes/test.json
diff --git a/chef/spec/data/object_loader/nodes/test.rb b/spec/data/object_loader/nodes/test.rb
index 9629539859..9629539859 100644
--- a/chef/spec/data/object_loader/nodes/test.rb
+++ b/spec/data/object_loader/nodes/test.rb
diff --git a/chef/spec/data/object_loader/nodes/test_json_class.json b/spec/data/object_loader/nodes/test_json_class.json
index f485ae8748..f485ae8748 100644
--- a/chef/spec/data/object_loader/nodes/test_json_class.json
+++ b/spec/data/object_loader/nodes/test_json_class.json
diff --git a/chef/spec/data/object_loader/roles/test.json b/spec/data/object_loader/roles/test.json
index cb4c790e44..cb4c790e44 100644
--- a/chef/spec/data/object_loader/roles/test.json
+++ b/spec/data/object_loader/roles/test.json
diff --git a/chef/spec/data/object_loader/roles/test.rb b/spec/data/object_loader/roles/test.rb
index 8bf4ee52e0..8bf4ee52e0 100644
--- a/chef/spec/data/object_loader/roles/test.rb
+++ b/spec/data/object_loader/roles/test.rb
diff --git a/chef/spec/data/object_loader/roles/test_json_class.json b/spec/data/object_loader/roles/test_json_class.json
index ce922f592d..ce922f592d 100644
--- a/chef/spec/data/object_loader/roles/test_json_class.json
+++ b/spec/data/object_loader/roles/test_json_class.json
diff --git a/chef/spec/data/old_home_dir/my-dot-emacs b/spec/data/old_home_dir/my-dot-emacs
index e69de29bb2..e69de29bb2 100644
--- a/chef/spec/data/old_home_dir/my-dot-emacs
+++ b/spec/data/old_home_dir/my-dot-emacs
diff --git a/chef/spec/data/old_home_dir/my-dot-vim b/spec/data/old_home_dir/my-dot-vim
index e69de29bb2..e69de29bb2 100644
--- a/chef/spec/data/old_home_dir/my-dot-vim
+++ b/spec/data/old_home_dir/my-dot-vim
diff --git a/chef/spec/data/recipes/test.rb b/spec/data/recipes/test.rb
index c33d714a2c..c33d714a2c 100644
--- a/chef/spec/data/recipes/test.rb
+++ b/spec/data/recipes/test.rb
diff --git a/chef/spec/data/remote_directory_data/remote_dir_file.txt b/spec/data/remote_directory_data/remote_dir_file.txt
index 17aa3a6838..17aa3a6838 100644
--- a/chef/spec/data/remote_directory_data/remote_dir_file.txt
+++ b/spec/data/remote_directory_data/remote_dir_file.txt
diff --git a/chef/spec/data/remote_directory_data/remote_subdirectory/remote_subdir_file.txt b/spec/data/remote_directory_data/remote_subdirectory/remote_subdir_file.txt
index a73728a4bb..a73728a4bb 100644
--- a/chef/spec/data/remote_directory_data/remote_subdirectory/remote_subdir_file.txt
+++ b/spec/data/remote_directory_data/remote_subdirectory/remote_subdir_file.txt
diff --git a/chef/spec/data/remote_file/nyan_cat.png b/spec/data/remote_file/nyan_cat.png
index 14cd6acf2a..14cd6acf2a 100644
--- a/chef/spec/data/remote_file/nyan_cat.png
+++ b/spec/data/remote_file/nyan_cat.png
diff --git a/chef/spec/data/run_context/cookbooks/test/attributes/george.rb b/spec/data/run_context/cookbooks/test/attributes/george.rb
index 8ea4454c79..8ea4454c79 100644
--- a/chef/spec/data/run_context/cookbooks/test/attributes/george.rb
+++ b/spec/data/run_context/cookbooks/test/attributes/george.rb
diff --git a/chef/spec/data/run_context/cookbooks/test/definitions/new_animals.rb b/spec/data/run_context/cookbooks/test/definitions/new_animals.rb
index 5b00553cfe..5b00553cfe 100644
--- a/chef/spec/data/run_context/cookbooks/test/definitions/new_animals.rb
+++ b/spec/data/run_context/cookbooks/test/definitions/new_animals.rb
diff --git a/chef/spec/data/run_context/cookbooks/test/definitions/new_cat.rb b/spec/data/run_context/cookbooks/test/definitions/new_cat.rb
index a49b53348c..a49b53348c 100644
--- a/chef/spec/data/run_context/cookbooks/test/definitions/new_cat.rb
+++ b/spec/data/run_context/cookbooks/test/definitions/new_cat.rb
diff --git a/chef/spec/data/run_context/cookbooks/test/recipes/default.rb b/spec/data/run_context/cookbooks/test/recipes/default.rb
index d769dc826d..d769dc826d 100644
--- a/chef/spec/data/run_context/cookbooks/test/recipes/default.rb
+++ b/spec/data/run_context/cookbooks/test/recipes/default.rb
diff --git a/chef/spec/data/run_context/cookbooks/test/recipes/one.rb b/spec/data/run_context/cookbooks/test/recipes/one.rb
index 7795cc1d4a..7795cc1d4a 100644
--- a/chef/spec/data/run_context/cookbooks/test/recipes/one.rb
+++ b/spec/data/run_context/cookbooks/test/recipes/one.rb
diff --git a/chef/spec/data/run_context/cookbooks/test/recipes/two.rb b/spec/data/run_context/cookbooks/test/recipes/two.rb
index 01def1b2ac..01def1b2ac 100644
--- a/chef/spec/data/run_context/cookbooks/test/recipes/two.rb
+++ b/spec/data/run_context/cookbooks/test/recipes/two.rb
diff --git a/chef/spec/data/run_context/nodes/run_context.rb b/spec/data/run_context/nodes/run_context.rb
index 076d21ab89..076d21ab89 100644
--- a/chef/spec/data/run_context/nodes/run_context.rb
+++ b/spec/data/run_context/nodes/run_context.rb
diff --git a/chef/spec/data/search_queries_to_transform.txt b/spec/data/search_queries_to_transform.txt
index 4a05d5405e..4a05d5405e 100644
--- a/chef/spec/data/search_queries_to_transform.txt
+++ b/spec/data/search_queries_to_transform.txt
diff --git a/chef/spec/data/ssl/5e707473.0 b/spec/data/ssl/5e707473.0
index 5c5cf87e11..5c5cf87e11 100644
--- a/chef/spec/data/ssl/5e707473.0
+++ b/spec/data/ssl/5e707473.0
diff --git a/chef/spec/data/ssl/chef-rspec.cert b/spec/data/ssl/chef-rspec.cert
index 08ec684520..08ec684520 100644
--- a/chef/spec/data/ssl/chef-rspec.cert
+++ b/spec/data/ssl/chef-rspec.cert
diff --git a/chef/spec/data/ssl/chef-rspec.key b/spec/data/ssl/chef-rspec.key
index 29aaecf2a6..29aaecf2a6 100644
--- a/chef/spec/data/ssl/chef-rspec.key
+++ b/spec/data/ssl/chef-rspec.key
diff --git a/chef/spec/data/ssl/key.pem b/spec/data/ssl/key.pem
index 50b8fd83c8..50b8fd83c8 100644
--- a/chef/spec/data/ssl/key.pem
+++ b/spec/data/ssl/key.pem
diff --git a/chef/spec/data/ssl/private_key.pem b/spec/data/ssl/private_key.pem
index b6636604a8..b6636604a8 100644
--- a/chef/spec/data/ssl/private_key.pem
+++ b/spec/data/ssl/private_key.pem
diff --git a/chef/spec/data/ssl/private_key_with_whitespace.pem b/spec/data/ssl/private_key_with_whitespace.pem
index b393a3f13d..b393a3f13d 100644
--- a/chef/spec/data/ssl/private_key_with_whitespace.pem
+++ b/spec/data/ssl/private_key_with_whitespace.pem
diff --git a/chef/spec/data/templates/seattle.txt b/spec/data/templates/seattle.txt
index 19f6290939..19f6290939 100644
--- a/chef/spec/data/templates/seattle.txt
+++ b/spec/data/templates/seattle.txt
diff --git a/chef/spec/functional/knife/cookbook_delete_spec.rb b/spec/functional/knife/cookbook_delete_spec.rb
index 54081263f0..54081263f0 100644
--- a/chef/spec/functional/knife/cookbook_delete_spec.rb
+++ b/spec/functional/knife/cookbook_delete_spec.rb
diff --git a/chef/spec/functional/knife/exec_spec.rb b/spec/functional/knife/exec_spec.rb
index fa4a448fbb..fa4a448fbb 100644
--- a/chef/spec/functional/knife/exec_spec.rb
+++ b/spec/functional/knife/exec_spec.rb
diff --git a/chef/spec/functional/knife/ssh_spec.rb b/spec/functional/knife/ssh_spec.rb
index 8f87e53bf7..8f87e53bf7 100644
--- a/chef/spec/functional/knife/ssh_spec.rb
+++ b/spec/functional/knife/ssh_spec.rb
diff --git a/chef/spec/functional/resource/directory_spec.rb b/spec/functional/resource/directory_spec.rb
index 5777a114fc..5777a114fc 100644
--- a/chef/spec/functional/resource/directory_spec.rb
+++ b/spec/functional/resource/directory_spec.rb
diff --git a/chef/spec/functional/resource/file_spec.rb b/spec/functional/resource/file_spec.rb
index d587e5f93b..d587e5f93b 100644
--- a/chef/spec/functional/resource/file_spec.rb
+++ b/spec/functional/resource/file_spec.rb
diff --git a/chef/spec/functional/resource/link_spec.rb b/spec/functional/resource/link_spec.rb
index b80dc72d49..b80dc72d49 100644
--- a/chef/spec/functional/resource/link_spec.rb
+++ b/spec/functional/resource/link_spec.rb
diff --git a/chef/spec/functional/resource/remote_directory_spec.rb b/spec/functional/resource/remote_directory_spec.rb
index c8319e37ba..c8319e37ba 100644
--- a/chef/spec/functional/resource/remote_directory_spec.rb
+++ b/spec/functional/resource/remote_directory_spec.rb
diff --git a/chef/spec/functional/resource/remote_file_spec.rb b/spec/functional/resource/remote_file_spec.rb
index e695e8feae..e695e8feae 100644
--- a/chef/spec/functional/resource/remote_file_spec.rb
+++ b/spec/functional/resource/remote_file_spec.rb
diff --git a/chef/spec/functional/resource/template_spec.rb b/spec/functional/resource/template_spec.rb
index 0dfdb17324..0dfdb17324 100644
--- a/chef/spec/functional/resource/template_spec.rb
+++ b/spec/functional/resource/template_spec.rb
diff --git a/chef/spec/functional/run_lock_spec.rb b/spec/functional/run_lock_spec.rb
index af9bd1aa1f..af9bd1aa1f 100644
--- a/chef/spec/functional/run_lock_spec.rb
+++ b/spec/functional/run_lock_spec.rb
diff --git a/chef/spec/functional/tiny_server_spec.rb b/spec/functional/tiny_server_spec.rb
index 0cfef4305f..0cfef4305f 100644
--- a/chef/spec/functional/tiny_server_spec.rb
+++ b/spec/functional/tiny_server_spec.rb
diff --git a/chef/spec/rcov.opts b/spec/rcov.opts
index 484626ea9c..484626ea9c 100644
--- a/chef/spec/rcov.opts
+++ b/spec/rcov.opts
diff --git a/chef/spec/spec_helper.rb b/spec/spec_helper.rb
index 1d101022ac..1d101022ac 100644
--- a/chef/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
diff --git a/chef/spec/stress/win32/file_spec.rb b/spec/stress/win32/file_spec.rb
index ef01aa632c..ef01aa632c 100644
--- a/chef/spec/stress/win32/file_spec.rb
+++ b/spec/stress/win32/file_spec.rb
diff --git a/chef/spec/stress/win32/memory_spec.rb b/spec/stress/win32/memory_spec.rb
index ed3ad306d0..ed3ad306d0 100644
--- a/chef/spec/stress/win32/memory_spec.rb
+++ b/spec/stress/win32/memory_spec.rb
diff --git a/chef/spec/stress/win32/security_spec.rb b/spec/stress/win32/security_spec.rb
index cc0b6c0d4c..cc0b6c0d4c 100644
--- a/chef/spec/stress/win32/security_spec.rb
+++ b/spec/stress/win32/security_spec.rb
diff --git a/chef/spec/support/chef_helpers.rb b/spec/support/chef_helpers.rb
index 77f5fc7669..77f5fc7669 100644
--- a/chef/spec/support/chef_helpers.rb
+++ b/spec/support/chef_helpers.rb
diff --git a/chef/spec/support/lib/chef/provider/easy.rb b/spec/support/lib/chef/provider/easy.rb
index 054b45256c..054b45256c 100644
--- a/chef/spec/support/lib/chef/provider/easy.rb
+++ b/spec/support/lib/chef/provider/easy.rb
diff --git a/chef/spec/support/lib/chef/provider/snakeoil.rb b/spec/support/lib/chef/provider/snakeoil.rb
index c5d8d52a82..c5d8d52a82 100644
--- a/chef/spec/support/lib/chef/provider/snakeoil.rb
+++ b/spec/support/lib/chef/provider/snakeoil.rb
diff --git a/chef/spec/support/lib/chef/resource/cat.rb b/spec/support/lib/chef/resource/cat.rb
index 5809ad3275..5809ad3275 100644
--- a/chef/spec/support/lib/chef/resource/cat.rb
+++ b/spec/support/lib/chef/resource/cat.rb
diff --git a/chef/spec/support/lib/chef/resource/one_two_three_four.rb b/spec/support/lib/chef/resource/one_two_three_four.rb
index 4f4b063eb6..4f4b063eb6 100644
--- a/chef/spec/support/lib/chef/resource/one_two_three_four.rb
+++ b/spec/support/lib/chef/resource/one_two_three_four.rb
diff --git a/chef/spec/support/lib/chef/resource/zen_master.rb b/spec/support/lib/chef/resource/zen_master.rb
index 71842b74c0..71842b74c0 100644
--- a/chef/spec/support/lib/chef/resource/zen_master.rb
+++ b/spec/support/lib/chef/resource/zen_master.rb
diff --git a/chef/spec/support/matchers/leak.rb b/spec/support/matchers/leak.rb
index eb80fcd492..eb80fcd492 100644
--- a/chef/spec/support/matchers/leak.rb
+++ b/spec/support/matchers/leak.rb
diff --git a/chef/spec/support/mock/constant.rb b/spec/support/mock/constant.rb
index c706ad29dd..c706ad29dd 100644
--- a/chef/spec/support/mock/constant.rb
+++ b/spec/support/mock/constant.rb
diff --git a/chef/spec/support/mock/platform.rb b/spec/support/mock/platform.rb
index 78b704ea9b..78b704ea9b 100644
--- a/chef/spec/support/mock/platform.rb
+++ b/spec/support/mock/platform.rb
diff --git a/chef/spec/support/platform_helpers.rb b/spec/support/platform_helpers.rb
index 558817d72a..558817d72a 100644
--- a/chef/spec/support/platform_helpers.rb
+++ b/spec/support/platform_helpers.rb
diff --git a/chef/spec/support/platforms/prof/gc.rb b/spec/support/platforms/prof/gc.rb
index 6ca50df648..6ca50df648 100644
--- a/chef/spec/support/platforms/prof/gc.rb
+++ b/spec/support/platforms/prof/gc.rb
diff --git a/chef/spec/support/platforms/prof/win32.rb b/spec/support/platforms/prof/win32.rb
index ab256ff0fc..ab256ff0fc 100644
--- a/chef/spec/support/platforms/prof/win32.rb
+++ b/spec/support/platforms/prof/win32.rb
diff --git a/chef/spec/support/shared/functional/directory_resource.rb b/spec/support/shared/functional/directory_resource.rb
index 14ab7a10e8..14ab7a10e8 100644
--- a/chef/spec/support/shared/functional/directory_resource.rb
+++ b/spec/support/shared/functional/directory_resource.rb
diff --git a/chef/spec/support/shared/functional/file_resource.rb b/spec/support/shared/functional/file_resource.rb
index 631a5ed742..631a5ed742 100644
--- a/chef/spec/support/shared/functional/file_resource.rb
+++ b/spec/support/shared/functional/file_resource.rb
diff --git a/chef/spec/support/shared/functional/knife.rb b/spec/support/shared/functional/knife.rb
index e96de7c27a..e96de7c27a 100644
--- a/chef/spec/support/shared/functional/knife.rb
+++ b/spec/support/shared/functional/knife.rb
diff --git a/chef/spec/support/shared/functional/securable_resource.rb b/spec/support/shared/functional/securable_resource.rb
index 2eeb16c784..2eeb16c784 100644
--- a/chef/spec/support/shared/functional/securable_resource.rb
+++ b/spec/support/shared/functional/securable_resource.rb
diff --git a/chef/spec/support/shared/unit/api_error_inspector.rb b/spec/support/shared/unit/api_error_inspector.rb
index 8231ceb195..8231ceb195 100644
--- a/chef/spec/support/shared/unit/api_error_inspector.rb
+++ b/spec/support/shared/unit/api_error_inspector.rb
diff --git a/chef/spec/support/shared/unit/file_system_support.rb b/spec/support/shared/unit/file_system_support.rb
index 8516292c67..8516292c67 100644
--- a/chef/spec/support/shared/unit/file_system_support.rb
+++ b/spec/support/shared/unit/file_system_support.rb
diff --git a/chef/spec/tiny_server.rb b/spec/tiny_server.rb
index ae8518097b..ae8518097b 100644
--- a/chef/spec/tiny_server.rb
+++ b/spec/tiny_server.rb
diff --git a/chef/spec/unit/api_client_spec.rb b/spec/unit/api_client_spec.rb
index e01243152e..e01243152e 100644
--- a/chef/spec/unit/api_client_spec.rb
+++ b/spec/unit/api_client_spec.rb
diff --git a/chef/spec/unit/application/agent_spec.rb b/spec/unit/application/agent_spec.rb
index e69de29bb2..e69de29bb2 100644
--- a/chef/spec/unit/application/agent_spec.rb
+++ b/spec/unit/application/agent_spec.rb
diff --git a/chef/spec/unit/application/client_spec.rb b/spec/unit/application/client_spec.rb
index c5480c4adc..c5480c4adc 100644
--- a/chef/spec/unit/application/client_spec.rb
+++ b/spec/unit/application/client_spec.rb
diff --git a/chef/spec/unit/application/knife_spec.rb b/spec/unit/application/knife_spec.rb
index 78a65e7045..78a65e7045 100644
--- a/chef/spec/unit/application/knife_spec.rb
+++ b/spec/unit/application/knife_spec.rb
diff --git a/chef/spec/unit/application/server_spec.rb b/spec/unit/application/server_spec.rb
index e69de29bb2..e69de29bb2 100644
--- a/chef/spec/unit/application/server_spec.rb
+++ b/spec/unit/application/server_spec.rb
diff --git a/chef/spec/unit/application/solo_spec.rb b/spec/unit/application/solo_spec.rb
index 148fb3cf87..148fb3cf87 100644
--- a/chef/spec/unit/application/solo_spec.rb
+++ b/spec/unit/application/solo_spec.rb
diff --git a/chef/spec/unit/application_spec.rb b/spec/unit/application_spec.rb
index c89bc27d4f..c89bc27d4f 100644
--- a/chef/spec/unit/application_spec.rb
+++ b/spec/unit/application_spec.rb
diff --git a/chef/spec/unit/checksum/storage/filesystem_spec.rb b/spec/unit/checksum/storage/filesystem_spec.rb
index a39644202e..a39644202e 100644
--- a/chef/spec/unit/checksum/storage/filesystem_spec.rb
+++ b/spec/unit/checksum/storage/filesystem_spec.rb
diff --git a/chef/spec/unit/checksum_cache_spec.rb b/spec/unit/checksum_cache_spec.rb
index 78e76b6dfb..78e76b6dfb 100644
--- a/chef/spec/unit/checksum_cache_spec.rb
+++ b/spec/unit/checksum_cache_spec.rb
diff --git a/chef/spec/unit/chef_fs/diff_spec.rb b/spec/unit/chef_fs/diff_spec.rb
index 19d87052ad..19d87052ad 100644
--- a/chef/spec/unit/chef_fs/diff_spec.rb
+++ b/spec/unit/chef_fs/diff_spec.rb
diff --git a/chef/spec/unit/chef_fs/file_pattern_spec.rb b/spec/unit/chef_fs/file_pattern_spec.rb
index 247ec01a77..247ec01a77 100644
--- a/chef/spec/unit/chef_fs/file_pattern_spec.rb
+++ b/spec/unit/chef_fs/file_pattern_spec.rb
diff --git a/chef/spec/unit/chef_fs/file_system/chef_server_root_dir_spec.rb b/spec/unit/chef_fs/file_system/chef_server_root_dir_spec.rb
index b60193c4ae..b60193c4ae 100644
--- a/chef/spec/unit/chef_fs/file_system/chef_server_root_dir_spec.rb
+++ b/spec/unit/chef_fs/file_system/chef_server_root_dir_spec.rb
diff --git a/chef/spec/unit/chef_fs/file_system/cookbooks_dir_spec.rb b/spec/unit/chef_fs/file_system/cookbooks_dir_spec.rb
index 35a777a9e4..35a777a9e4 100644
--- a/chef/spec/unit/chef_fs/file_system/cookbooks_dir_spec.rb
+++ b/spec/unit/chef_fs/file_system/cookbooks_dir_spec.rb
diff --git a/chef/spec/unit/chef_fs/file_system/data_bags_dir_spec.rb b/spec/unit/chef_fs/file_system/data_bags_dir_spec.rb
index c8d29da84e..c8d29da84e 100644
--- a/chef/spec/unit/chef_fs/file_system/data_bags_dir_spec.rb
+++ b/spec/unit/chef_fs/file_system/data_bags_dir_spec.rb
diff --git a/chef/spec/unit/chef_fs/file_system_spec.rb b/spec/unit/chef_fs/file_system_spec.rb
index 40d85e8a53..40d85e8a53 100644
--- a/chef/spec/unit/chef_fs/file_system_spec.rb
+++ b/spec/unit/chef_fs/file_system_spec.rb
diff --git a/chef/spec/unit/chef_spec.rb b/spec/unit/chef_spec.rb
index cf60e64629..cf60e64629 100644
--- a/chef/spec/unit/chef_spec.rb
+++ b/spec/unit/chef_spec.rb
diff --git a/chef/spec/unit/client_spec.rb b/spec/unit/client_spec.rb
index 9d0c88dad1..9d0c88dad1 100644
--- a/chef/spec/unit/client_spec.rb
+++ b/spec/unit/client_spec.rb
diff --git a/chef/spec/unit/config_spec.rb b/spec/unit/config_spec.rb
index 89161c9df1..89161c9df1 100644
--- a/chef/spec/unit/config_spec.rb
+++ b/spec/unit/config_spec.rb
diff --git a/chef/spec/unit/cookbook/chefignore_spec.rb b/spec/unit/cookbook/chefignore_spec.rb
index 30b97e865d..30b97e865d 100644
--- a/chef/spec/unit/cookbook/chefignore_spec.rb
+++ b/spec/unit/cookbook/chefignore_spec.rb
diff --git a/chef/spec/unit/cookbook/metadata_spec.rb b/spec/unit/cookbook/metadata_spec.rb
index 2757f92506..2757f92506 100644
--- a/chef/spec/unit/cookbook/metadata_spec.rb
+++ b/spec/unit/cookbook/metadata_spec.rb
diff --git a/chef/spec/unit/cookbook/synchronizer_spec.rb b/spec/unit/cookbook/synchronizer_spec.rb
index e84fd3cfc5..e84fd3cfc5 100644
--- a/chef/spec/unit/cookbook/synchronizer_spec.rb
+++ b/spec/unit/cookbook/synchronizer_spec.rb
diff --git a/chef/spec/unit/cookbook/syntax_check_spec.rb b/spec/unit/cookbook/syntax_check_spec.rb
index b41c2ddf0a..b41c2ddf0a 100644
--- a/chef/spec/unit/cookbook/syntax_check_spec.rb
+++ b/spec/unit/cookbook/syntax_check_spec.rb
diff --git a/chef/spec/unit/cookbook_loader_spec.rb b/spec/unit/cookbook_loader_spec.rb
index 1d694b5ef6..1d694b5ef6 100644
--- a/chef/spec/unit/cookbook_loader_spec.rb
+++ b/spec/unit/cookbook_loader_spec.rb
diff --git a/chef/spec/unit/cookbook_manifest_spec.rb b/spec/unit/cookbook_manifest_spec.rb
index 7da87e93a5..7da87e93a5 100644
--- a/chef/spec/unit/cookbook_manifest_spec.rb
+++ b/spec/unit/cookbook_manifest_spec.rb
diff --git a/chef/spec/unit/cookbook_spec.rb b/spec/unit/cookbook_spec.rb
index c28a5c7a2a..c28a5c7a2a 100644
--- a/chef/spec/unit/cookbook_spec.rb
+++ b/spec/unit/cookbook_spec.rb
diff --git a/chef/spec/unit/cookbook_version_spec.rb b/spec/unit/cookbook_version_spec.rb
index 85e1db1fae..85e1db1fae 100644
--- a/chef/spec/unit/cookbook_version_spec.rb
+++ b/spec/unit/cookbook_version_spec.rb
diff --git a/chef/spec/unit/daemon_spec.rb b/spec/unit/daemon_spec.rb
index 1efdf2a2ad..1efdf2a2ad 100644
--- a/chef/spec/unit/daemon_spec.rb
+++ b/spec/unit/daemon_spec.rb
diff --git a/chef/spec/unit/data_bag_item_spec.rb b/spec/unit/data_bag_item_spec.rb
index 6f46c81054..6f46c81054 100644
--- a/chef/spec/unit/data_bag_item_spec.rb
+++ b/spec/unit/data_bag_item_spec.rb
diff --git a/chef/spec/unit/data_bag_spec.rb b/spec/unit/data_bag_spec.rb
index ec45e28a9b..ec45e28a9b 100644
--- a/chef/spec/unit/data_bag_spec.rb
+++ b/spec/unit/data_bag_spec.rb
diff --git a/chef/spec/unit/dsl/data_query_spec.rb b/spec/unit/dsl/data_query_spec.rb
index 8960ad9957..8960ad9957 100644
--- a/chef/spec/unit/dsl/data_query_spec.rb
+++ b/spec/unit/dsl/data_query_spec.rb
diff --git a/chef/spec/unit/dsl/platfrom_introspection_spec.rb b/spec/unit/dsl/platfrom_introspection_spec.rb
index e6cc7ad9ff..e6cc7ad9ff 100644
--- a/chef/spec/unit/dsl/platfrom_introspection_spec.rb
+++ b/spec/unit/dsl/platfrom_introspection_spec.rb
diff --git a/chef/spec/unit/encrypted_data_bag_item_spec.rb b/spec/unit/encrypted_data_bag_item_spec.rb
index 0b052b56c6..0b052b56c6 100644
--- a/chef/spec/unit/encrypted_data_bag_item_spec.rb
+++ b/spec/unit/encrypted_data_bag_item_spec.rb
diff --git a/chef/spec/unit/environment_spec.rb b/spec/unit/environment_spec.rb
index 97f0c3395e..97f0c3395e 100644
--- a/chef/spec/unit/environment_spec.rb
+++ b/spec/unit/environment_spec.rb
diff --git a/chef/spec/unit/exceptions_spec.rb b/spec/unit/exceptions_spec.rb
index a979d2f6b9..a979d2f6b9 100644
--- a/chef/spec/unit/exceptions_spec.rb
+++ b/spec/unit/exceptions_spec.rb
diff --git a/chef/spec/unit/file_access_control_spec.rb b/spec/unit/file_access_control_spec.rb
index 491505c692..491505c692 100644
--- a/chef/spec/unit/file_access_control_spec.rb
+++ b/spec/unit/file_access_control_spec.rb
diff --git a/chef/spec/unit/file_cache_spec.rb b/spec/unit/file_cache_spec.rb
index 6596326565..6596326565 100644
--- a/chef/spec/unit/file_cache_spec.rb
+++ b/spec/unit/file_cache_spec.rb
diff --git a/chef/spec/unit/formatters/error_inspectors/compile_error_inspector_spec.rb b/spec/unit/formatters/error_inspectors/compile_error_inspector_spec.rb
index e1f8f28bb9..e1f8f28bb9 100644
--- a/chef/spec/unit/formatters/error_inspectors/compile_error_inspector_spec.rb
+++ b/spec/unit/formatters/error_inspectors/compile_error_inspector_spec.rb
diff --git a/chef/spec/unit/formatters/error_inspectors/cookbook_resolve_error_inspector_spec.rb b/spec/unit/formatters/error_inspectors/cookbook_resolve_error_inspector_spec.rb
index bb694f8e5c..bb694f8e5c 100644
--- a/chef/spec/unit/formatters/error_inspectors/cookbook_resolve_error_inspector_spec.rb
+++ b/spec/unit/formatters/error_inspectors/cookbook_resolve_error_inspector_spec.rb
diff --git a/chef/spec/unit/formatters/error_inspectors/cookbook_sync_error_inspector_spec.rb b/spec/unit/formatters/error_inspectors/cookbook_sync_error_inspector_spec.rb
index 6db7aaaa0d..6db7aaaa0d 100644
--- a/chef/spec/unit/formatters/error_inspectors/cookbook_sync_error_inspector_spec.rb
+++ b/spec/unit/formatters/error_inspectors/cookbook_sync_error_inspector_spec.rb
diff --git a/chef/spec/unit/formatters/error_inspectors/node_load_error_inspector_spec.rb b/spec/unit/formatters/error_inspectors/node_load_error_inspector_spec.rb
index bd3cc6b764..bd3cc6b764 100644
--- a/chef/spec/unit/formatters/error_inspectors/node_load_error_inspector_spec.rb
+++ b/spec/unit/formatters/error_inspectors/node_load_error_inspector_spec.rb
diff --git a/chef/spec/unit/formatters/error_inspectors/registration_error_inspector_spec.rb b/spec/unit/formatters/error_inspectors/registration_error_inspector_spec.rb
index 4fcf034d80..4fcf034d80 100644
--- a/chef/spec/unit/formatters/error_inspectors/registration_error_inspector_spec.rb
+++ b/spec/unit/formatters/error_inspectors/registration_error_inspector_spec.rb
diff --git a/chef/spec/unit/formatters/error_inspectors/resource_failure_inspector_spec.rb b/spec/unit/formatters/error_inspectors/resource_failure_inspector_spec.rb
index 52c719d2fb..52c719d2fb 100644
--- a/chef/spec/unit/formatters/error_inspectors/resource_failure_inspector_spec.rb
+++ b/spec/unit/formatters/error_inspectors/resource_failure_inspector_spec.rb
diff --git a/chef/spec/unit/formatters/error_inspectors/run_list_expansion_error_inspector_spec.rb b/spec/unit/formatters/error_inspectors/run_list_expansion_error_inspector_spec.rb
index 4b6751a120..4b6751a120 100644
--- a/chef/spec/unit/formatters/error_inspectors/run_list_expansion_error_inspector_spec.rb
+++ b/spec/unit/formatters/error_inspectors/run_list_expansion_error_inspector_spec.rb
diff --git a/chef/spec/unit/handler/json_file_spec.rb b/spec/unit/handler/json_file_spec.rb
index 1f47c40937..1f47c40937 100644
--- a/chef/spec/unit/handler/json_file_spec.rb
+++ b/spec/unit/handler/json_file_spec.rb
diff --git a/chef/spec/unit/handler_spec.rb b/spec/unit/handler_spec.rb
index 9eeba478ac..9eeba478ac 100644
--- a/chef/spec/unit/handler_spec.rb
+++ b/spec/unit/handler_spec.rb
diff --git a/chef/spec/unit/json_compat_spect.rb b/spec/unit/json_compat_spect.rb
index aa688c0791..aa688c0791 100644
--- a/chef/spec/unit/json_compat_spect.rb
+++ b/spec/unit/json_compat_spect.rb
diff --git a/chef/spec/unit/knife/bootstrap_spec.rb b/spec/unit/knife/bootstrap_spec.rb
index b2247bb5a4..b2247bb5a4 100644
--- a/chef/spec/unit/knife/bootstrap_spec.rb
+++ b/spec/unit/knife/bootstrap_spec.rb
diff --git a/chef/spec/unit/knife/client_bulk_delete_spec.rb b/spec/unit/knife/client_bulk_delete_spec.rb
index 55351554d1..55351554d1 100644
--- a/chef/spec/unit/knife/client_bulk_delete_spec.rb
+++ b/spec/unit/knife/client_bulk_delete_spec.rb
diff --git a/chef/spec/unit/knife/client_create_spec.rb b/spec/unit/knife/client_create_spec.rb
index c049748074..c049748074 100644
--- a/chef/spec/unit/knife/client_create_spec.rb
+++ b/spec/unit/knife/client_create_spec.rb
diff --git a/chef/spec/unit/knife/client_delete_spec.rb b/spec/unit/knife/client_delete_spec.rb
index 865f19f713..865f19f713 100644
--- a/chef/spec/unit/knife/client_delete_spec.rb
+++ b/spec/unit/knife/client_delete_spec.rb
diff --git a/chef/spec/unit/knife/client_edit_spec.rb b/spec/unit/knife/client_edit_spec.rb
index 1308d14fd5..1308d14fd5 100644
--- a/chef/spec/unit/knife/client_edit_spec.rb
+++ b/spec/unit/knife/client_edit_spec.rb
diff --git a/chef/spec/unit/knife/client_list_spec.rb b/spec/unit/knife/client_list_spec.rb
index 6237a0d14c..6237a0d14c 100644
--- a/chef/spec/unit/knife/client_list_spec.rb
+++ b/spec/unit/knife/client_list_spec.rb
diff --git a/chef/spec/unit/knife/client_reregister_spec.rb b/spec/unit/knife/client_reregister_spec.rb
index 0d284c0f58..0d284c0f58 100644
--- a/chef/spec/unit/knife/client_reregister_spec.rb
+++ b/spec/unit/knife/client_reregister_spec.rb
diff --git a/chef/spec/unit/knife/client_show_spec.rb b/spec/unit/knife/client_show_spec.rb
index 5bac3b4af6..5bac3b4af6 100644
--- a/chef/spec/unit/knife/client_show_spec.rb
+++ b/spec/unit/knife/client_show_spec.rb
diff --git a/chef/spec/unit/knife/config_file_selection_spec.rb b/spec/unit/knife/config_file_selection_spec.rb
index 3ee18d82d0..3ee18d82d0 100644
--- a/chef/spec/unit/knife/config_file_selection_spec.rb
+++ b/spec/unit/knife/config_file_selection_spec.rb
diff --git a/chef/spec/unit/knife/configure_client_spec.rb b/spec/unit/knife/configure_client_spec.rb
index ba832103bc..ba832103bc 100644
--- a/chef/spec/unit/knife/configure_client_spec.rb
+++ b/spec/unit/knife/configure_client_spec.rb
diff --git a/chef/spec/unit/knife/configure_spec.rb b/spec/unit/knife/configure_spec.rb
index 85ee996dd5..85ee996dd5 100644
--- a/chef/spec/unit/knife/configure_spec.rb
+++ b/spec/unit/knife/configure_spec.rb
diff --git a/chef/spec/unit/knife/cookbook_bulk_delete_spec.rb b/spec/unit/knife/cookbook_bulk_delete_spec.rb
index ced2a9a4e4..ced2a9a4e4 100644
--- a/chef/spec/unit/knife/cookbook_bulk_delete_spec.rb
+++ b/spec/unit/knife/cookbook_bulk_delete_spec.rb
diff --git a/chef/spec/unit/knife/cookbook_create_spec.rb b/spec/unit/knife/cookbook_create_spec.rb
index dc1d7d7f79..dc1d7d7f79 100644
--- a/chef/spec/unit/knife/cookbook_create_spec.rb
+++ b/spec/unit/knife/cookbook_create_spec.rb
diff --git a/chef/spec/unit/knife/cookbook_delete_spec.rb b/spec/unit/knife/cookbook_delete_spec.rb
index afaa3b69a5..afaa3b69a5 100644
--- a/chef/spec/unit/knife/cookbook_delete_spec.rb
+++ b/spec/unit/knife/cookbook_delete_spec.rb
diff --git a/chef/spec/unit/knife/cookbook_download_spec.rb b/spec/unit/knife/cookbook_download_spec.rb
index 6ae3fbecd2..6ae3fbecd2 100644
--- a/chef/spec/unit/knife/cookbook_download_spec.rb
+++ b/spec/unit/knife/cookbook_download_spec.rb
diff --git a/chef/spec/unit/knife/cookbook_list_spec.rb b/spec/unit/knife/cookbook_list_spec.rb
index db6f061bd1..db6f061bd1 100644
--- a/chef/spec/unit/knife/cookbook_list_spec.rb
+++ b/spec/unit/knife/cookbook_list_spec.rb
diff --git a/chef/spec/unit/knife/cookbook_metadata_from_file_spec.rb b/spec/unit/knife/cookbook_metadata_from_file_spec.rb
index 60555d89dc..60555d89dc 100644
--- a/chef/spec/unit/knife/cookbook_metadata_from_file_spec.rb
+++ b/spec/unit/knife/cookbook_metadata_from_file_spec.rb
diff --git a/chef/spec/unit/knife/cookbook_metadata_spec.rb b/spec/unit/knife/cookbook_metadata_spec.rb
index c664326a3d..c664326a3d 100644
--- a/chef/spec/unit/knife/cookbook_metadata_spec.rb
+++ b/spec/unit/knife/cookbook_metadata_spec.rb
diff --git a/chef/spec/unit/knife/cookbook_show_spec.rb b/spec/unit/knife/cookbook_show_spec.rb
index 2f2d841fea..2f2d841fea 100644
--- a/chef/spec/unit/knife/cookbook_show_spec.rb
+++ b/spec/unit/knife/cookbook_show_spec.rb
diff --git a/chef/spec/unit/knife/cookbook_site_download_spec.rb b/spec/unit/knife/cookbook_site_download_spec.rb
index a3d43c5b4a..a3d43c5b4a 100644
--- a/chef/spec/unit/knife/cookbook_site_download_spec.rb
+++ b/spec/unit/knife/cookbook_site_download_spec.rb
diff --git a/chef/spec/unit/knife/cookbook_site_install_spec.rb b/spec/unit/knife/cookbook_site_install_spec.rb
index 2ec87b8d16..2ec87b8d16 100644
--- a/chef/spec/unit/knife/cookbook_site_install_spec.rb
+++ b/spec/unit/knife/cookbook_site_install_spec.rb
diff --git a/chef/spec/unit/knife/cookbook_site_share_spec.rb b/spec/unit/knife/cookbook_site_share_spec.rb
index 3b912af0c5..3b912af0c5 100644
--- a/chef/spec/unit/knife/cookbook_site_share_spec.rb
+++ b/spec/unit/knife/cookbook_site_share_spec.rb
diff --git a/chef/spec/unit/knife/cookbook_site_unshare_spec.rb b/spec/unit/knife/cookbook_site_unshare_spec.rb
index ffba2ec664..ffba2ec664 100644
--- a/chef/spec/unit/knife/cookbook_site_unshare_spec.rb
+++ b/spec/unit/knife/cookbook_site_unshare_spec.rb
diff --git a/chef/spec/unit/knife/cookbook_test_spec.rb b/spec/unit/knife/cookbook_test_spec.rb
index 24c658dc6c..24c658dc6c 100644
--- a/chef/spec/unit/knife/cookbook_test_spec.rb
+++ b/spec/unit/knife/cookbook_test_spec.rb
diff --git a/chef/spec/unit/knife/cookbook_upload_spec.rb b/spec/unit/knife/cookbook_upload_spec.rb
index 4659e60371..4659e60371 100644
--- a/chef/spec/unit/knife/cookbook_upload_spec.rb
+++ b/spec/unit/knife/cookbook_upload_spec.rb
diff --git a/chef/spec/unit/knife/core/bootstrap_context_spec.rb b/spec/unit/knife/core/bootstrap_context_spec.rb
index f8a58484a5..f8a58484a5 100644
--- a/chef/spec/unit/knife/core/bootstrap_context_spec.rb
+++ b/spec/unit/knife/core/bootstrap_context_spec.rb
diff --git a/chef/spec/unit/knife/core/cookbook_scm_repo_spec.rb b/spec/unit/knife/core/cookbook_scm_repo_spec.rb
index 629164ad0a..629164ad0a 100644
--- a/chef/spec/unit/knife/core/cookbook_scm_repo_spec.rb
+++ b/spec/unit/knife/core/cookbook_scm_repo_spec.rb
diff --git a/chef/spec/unit/knife/core/object_loader_spec.rb b/spec/unit/knife/core/object_loader_spec.rb
index b3456e2b15..b3456e2b15 100644
--- a/chef/spec/unit/knife/core/object_loader_spec.rb
+++ b/spec/unit/knife/core/object_loader_spec.rb
diff --git a/chef/spec/unit/knife/core/subcommand_loader_spec.rb b/spec/unit/knife/core/subcommand_loader_spec.rb
index e39e0be041..e39e0be041 100644
--- a/chef/spec/unit/knife/core/subcommand_loader_spec.rb
+++ b/spec/unit/knife/core/subcommand_loader_spec.rb
diff --git a/chef/spec/unit/knife/core/ui_spec.rb b/spec/unit/knife/core/ui_spec.rb
index 784ad1f0d7..784ad1f0d7 100644
--- a/chef/spec/unit/knife/core/ui_spec.rb
+++ b/spec/unit/knife/core/ui_spec.rb
diff --git a/chef/spec/unit/knife/data_bag_create_spec.rb b/spec/unit/knife/data_bag_create_spec.rb
index 7d9433984f..7d9433984f 100644
--- a/chef/spec/unit/knife/data_bag_create_spec.rb
+++ b/spec/unit/knife/data_bag_create_spec.rb
diff --git a/chef/spec/unit/knife/data_bag_edit_spec.rb b/spec/unit/knife/data_bag_edit_spec.rb
index 572722541a..572722541a 100644
--- a/chef/spec/unit/knife/data_bag_edit_spec.rb
+++ b/spec/unit/knife/data_bag_edit_spec.rb
diff --git a/chef/spec/unit/knife/data_bag_from_file_spec.rb b/spec/unit/knife/data_bag_from_file_spec.rb
index f4ed7ca5de..f4ed7ca5de 100644
--- a/chef/spec/unit/knife/data_bag_from_file_spec.rb
+++ b/spec/unit/knife/data_bag_from_file_spec.rb
diff --git a/chef/spec/unit/knife/data_bag_show_spec.rb b/spec/unit/knife/data_bag_show_spec.rb
index 08ecfaa0a7..08ecfaa0a7 100644
--- a/chef/spec/unit/knife/data_bag_show_spec.rb
+++ b/spec/unit/knife/data_bag_show_spec.rb
diff --git a/chef/spec/unit/knife/environment_create_spec.rb b/spec/unit/knife/environment_create_spec.rb
index 36f6556682..36f6556682 100644
--- a/chef/spec/unit/knife/environment_create_spec.rb
+++ b/spec/unit/knife/environment_create_spec.rb
diff --git a/chef/spec/unit/knife/environment_delete_spec.rb b/spec/unit/knife/environment_delete_spec.rb
index 219ae4a923..219ae4a923 100644
--- a/chef/spec/unit/knife/environment_delete_spec.rb
+++ b/spec/unit/knife/environment_delete_spec.rb
diff --git a/chef/spec/unit/knife/environment_edit_spec.rb b/spec/unit/knife/environment_edit_spec.rb
index 91f9f5d0f0..91f9f5d0f0 100644
--- a/chef/spec/unit/knife/environment_edit_spec.rb
+++ b/spec/unit/knife/environment_edit_spec.rb
diff --git a/chef/spec/unit/knife/environment_from_file_spec.rb b/spec/unit/knife/environment_from_file_spec.rb
index d2234d9be1..d2234d9be1 100644
--- a/chef/spec/unit/knife/environment_from_file_spec.rb
+++ b/spec/unit/knife/environment_from_file_spec.rb
diff --git a/chef/spec/unit/knife/environment_list_spec.rb b/spec/unit/knife/environment_list_spec.rb
index 05a3ae748a..05a3ae748a 100644
--- a/chef/spec/unit/knife/environment_list_spec.rb
+++ b/spec/unit/knife/environment_list_spec.rb
diff --git a/chef/spec/unit/knife/environment_show_spec.rb b/spec/unit/knife/environment_show_spec.rb
index 1e1556f4c3..1e1556f4c3 100644
--- a/chef/spec/unit/knife/environment_show_spec.rb
+++ b/spec/unit/knife/environment_show_spec.rb
diff --git a/chef/spec/unit/knife/index_rebuild_spec.rb b/spec/unit/knife/index_rebuild_spec.rb
index 3b22a3b88c..3b22a3b88c 100644
--- a/chef/spec/unit/knife/index_rebuild_spec.rb
+++ b/spec/unit/knife/index_rebuild_spec.rb
diff --git a/chef/spec/unit/knife/knife_help.rb b/spec/unit/knife/knife_help.rb
index f5753e3d62..f5753e3d62 100644
--- a/chef/spec/unit/knife/knife_help.rb
+++ b/spec/unit/knife/knife_help.rb
diff --git a/chef/spec/unit/knife/node_bulk_delete_spec.rb b/spec/unit/knife/node_bulk_delete_spec.rb
index 51f707dfcf..51f707dfcf 100644
--- a/chef/spec/unit/knife/node_bulk_delete_spec.rb
+++ b/spec/unit/knife/node_bulk_delete_spec.rb
diff --git a/chef/spec/unit/knife/node_delete_spec.rb b/spec/unit/knife/node_delete_spec.rb
index b1b3db1aa4..b1b3db1aa4 100644
--- a/chef/spec/unit/knife/node_delete_spec.rb
+++ b/spec/unit/knife/node_delete_spec.rb
diff --git a/chef/spec/unit/knife/node_edit_spec.rb b/spec/unit/knife/node_edit_spec.rb
index 0ba2e90cfe..0ba2e90cfe 100644
--- a/chef/spec/unit/knife/node_edit_spec.rb
+++ b/spec/unit/knife/node_edit_spec.rb
diff --git a/chef/spec/unit/knife/node_from_file_spec.rb b/spec/unit/knife/node_from_file_spec.rb
index c6b9610d9e..c6b9610d9e 100644
--- a/chef/spec/unit/knife/node_from_file_spec.rb
+++ b/spec/unit/knife/node_from_file_spec.rb
diff --git a/chef/spec/unit/knife/node_list_spec.rb b/spec/unit/knife/node_list_spec.rb
index 5637d679c8..5637d679c8 100644
--- a/chef/spec/unit/knife/node_list_spec.rb
+++ b/spec/unit/knife/node_list_spec.rb
diff --git a/chef/spec/unit/knife/node_run_list_add_spec.rb b/spec/unit/knife/node_run_list_add_spec.rb
index ee0cfc9038..ee0cfc9038 100644
--- a/chef/spec/unit/knife/node_run_list_add_spec.rb
+++ b/spec/unit/knife/node_run_list_add_spec.rb
diff --git a/chef/spec/unit/knife/node_run_list_remove_spec.rb b/spec/unit/knife/node_run_list_remove_spec.rb
index 90869e8baa..90869e8baa 100644
--- a/chef/spec/unit/knife/node_run_list_remove_spec.rb
+++ b/spec/unit/knife/node_run_list_remove_spec.rb
diff --git a/chef/spec/unit/knife/node_show_spec.rb b/spec/unit/knife/node_show_spec.rb
index 6600b2aa96..6600b2aa96 100644
--- a/chef/spec/unit/knife/node_show_spec.rb
+++ b/spec/unit/knife/node_show_spec.rb
diff --git a/chef/spec/unit/knife/role_bulk_delete_spec.rb b/spec/unit/knife/role_bulk_delete_spec.rb
index 0ee84f6455..0ee84f6455 100644
--- a/chef/spec/unit/knife/role_bulk_delete_spec.rb
+++ b/spec/unit/knife/role_bulk_delete_spec.rb
diff --git a/chef/spec/unit/knife/role_create_spec.rb b/spec/unit/knife/role_create_spec.rb
index af3a6bf539..af3a6bf539 100644
--- a/chef/spec/unit/knife/role_create_spec.rb
+++ b/spec/unit/knife/role_create_spec.rb
diff --git a/chef/spec/unit/knife/role_delete_spec.rb b/spec/unit/knife/role_delete_spec.rb
index d2d8b889b3..d2d8b889b3 100644
--- a/chef/spec/unit/knife/role_delete_spec.rb
+++ b/spec/unit/knife/role_delete_spec.rb
diff --git a/chef/spec/unit/knife/role_edit_spec.rb b/spec/unit/knife/role_edit_spec.rb
index 3a002f348c..3a002f348c 100644
--- a/chef/spec/unit/knife/role_edit_spec.rb
+++ b/spec/unit/knife/role_edit_spec.rb
diff --git a/chef/spec/unit/knife/role_from_file_spec.rb b/spec/unit/knife/role_from_file_spec.rb
index 9b81bb14af..9b81bb14af 100644
--- a/chef/spec/unit/knife/role_from_file_spec.rb
+++ b/spec/unit/knife/role_from_file_spec.rb
diff --git a/chef/spec/unit/knife/role_list_spec.rb b/spec/unit/knife/role_list_spec.rb
index 1a5e8e2a72..1a5e8e2a72 100644
--- a/chef/spec/unit/knife/role_list_spec.rb
+++ b/spec/unit/knife/role_list_spec.rb
diff --git a/chef/spec/unit/knife/ssh_spec.rb b/spec/unit/knife/ssh_spec.rb
index 6e90a87f01..6e90a87f01 100644
--- a/chef/spec/unit/knife/ssh_spec.rb
+++ b/spec/unit/knife/ssh_spec.rb
diff --git a/chef/spec/unit/knife/status_spec.rb b/spec/unit/knife/status_spec.rb
index b009997ab1..b009997ab1 100644
--- a/chef/spec/unit/knife/status_spec.rb
+++ b/spec/unit/knife/status_spec.rb
diff --git a/chef/spec/unit/knife/tag_create_spec.rb b/spec/unit/knife/tag_create_spec.rb
index 925d060879..925d060879 100644
--- a/chef/spec/unit/knife/tag_create_spec.rb
+++ b/spec/unit/knife/tag_create_spec.rb
diff --git a/chef/spec/unit/knife/tag_delete_spec.rb b/spec/unit/knife/tag_delete_spec.rb
index ca279033a4..ca279033a4 100644
--- a/chef/spec/unit/knife/tag_delete_spec.rb
+++ b/spec/unit/knife/tag_delete_spec.rb
diff --git a/chef/spec/unit/knife/tag_list_spec.rb b/spec/unit/knife/tag_list_spec.rb
index 0de5d5ebd8..0de5d5ebd8 100644
--- a/chef/spec/unit/knife/tag_list_spec.rb
+++ b/spec/unit/knife/tag_list_spec.rb
diff --git a/chef/spec/unit/knife_spec.rb b/spec/unit/knife_spec.rb
index 0517014db0..0517014db0 100644
--- a/chef/spec/unit/knife_spec.rb
+++ b/spec/unit/knife_spec.rb
diff --git a/chef/spec/unit/log_spec.rb b/spec/unit/log_spec.rb
index b91ee020bb..b91ee020bb 100644
--- a/chef/spec/unit/log_spec.rb
+++ b/spec/unit/log_spec.rb
diff --git a/chef/spec/unit/lwrp_spec.rb b/spec/unit/lwrp_spec.rb
index da2278e547..da2278e547 100644
--- a/chef/spec/unit/lwrp_spec.rb
+++ b/spec/unit/lwrp_spec.rb
diff --git a/chef/spec/unit/mash_spec.rb b/spec/unit/mash_spec.rb
index b9a7cd0932..b9a7cd0932 100644
--- a/chef/spec/unit/mash_spec.rb
+++ b/spec/unit/mash_spec.rb
diff --git a/chef/spec/unit/mixin/checksum_spec.rb b/spec/unit/mixin/checksum_spec.rb
index dec270e18f..dec270e18f 100644
--- a/chef/spec/unit/mixin/checksum_spec.rb
+++ b/spec/unit/mixin/checksum_spec.rb
diff --git a/chef/spec/unit/mixin/command_spec.rb b/spec/unit/mixin/command_spec.rb
index e143b8728b..e143b8728b 100644
--- a/chef/spec/unit/mixin/command_spec.rb
+++ b/spec/unit/mixin/command_spec.rb
diff --git a/chef/spec/unit/mixin/convert_to_class_name_spec.rb b/spec/unit/mixin/convert_to_class_name_spec.rb
index b78d3f9101..b78d3f9101 100644
--- a/chef/spec/unit/mixin/convert_to_class_name_spec.rb
+++ b/spec/unit/mixin/convert_to_class_name_spec.rb
diff --git a/chef/spec/unit/mixin/deep_merge_spec.rb b/spec/unit/mixin/deep_merge_spec.rb
index cbc9b1544f..cbc9b1544f 100644
--- a/chef/spec/unit/mixin/deep_merge_spec.rb
+++ b/spec/unit/mixin/deep_merge_spec.rb
diff --git a/chef/spec/unit/mixin/deprecation_spec.rb b/spec/unit/mixin/deprecation_spec.rb
index 1b62dcd124..1b62dcd124 100644
--- a/chef/spec/unit/mixin/deprecation_spec.rb
+++ b/spec/unit/mixin/deprecation_spec.rb
diff --git a/chef/spec/unit/mixin/enforce_ownership_and_permissions_spec.rb b/spec/unit/mixin/enforce_ownership_and_permissions_spec.rb
index 53a8260cdc..53a8260cdc 100644
--- a/chef/spec/unit/mixin/enforce_ownership_and_permissions_spec.rb
+++ b/spec/unit/mixin/enforce_ownership_and_permissions_spec.rb
diff --git a/chef/spec/unit/mixin/params_validate_spec.rb b/spec/unit/mixin/params_validate_spec.rb
index b79156109b..b79156109b 100644
--- a/chef/spec/unit/mixin/params_validate_spec.rb
+++ b/spec/unit/mixin/params_validate_spec.rb
diff --git a/chef/spec/unit/mixin/path_sanity_spec.rb b/spec/unit/mixin/path_sanity_spec.rb
index e38ee7dc8a..e38ee7dc8a 100644
--- a/chef/spec/unit/mixin/path_sanity_spec.rb
+++ b/spec/unit/mixin/path_sanity_spec.rb
diff --git a/chef/spec/unit/mixin/securable_spec.rb b/spec/unit/mixin/securable_spec.rb
index d2e8770c9d..d2e8770c9d 100644
--- a/chef/spec/unit/mixin/securable_spec.rb
+++ b/spec/unit/mixin/securable_spec.rb
diff --git a/chef/spec/unit/mixin/shell_out_spec.rb b/spec/unit/mixin/shell_out_spec.rb
index 6ca700fcdb..6ca700fcdb 100644
--- a/chef/spec/unit/mixin/shell_out_spec.rb
+++ b/spec/unit/mixin/shell_out_spec.rb
diff --git a/chef/spec/unit/mixin/template_spec.rb b/spec/unit/mixin/template_spec.rb
index 3d8a723a75..3d8a723a75 100644
--- a/chef/spec/unit/mixin/template_spec.rb
+++ b/spec/unit/mixin/template_spec.rb
diff --git a/chef/spec/unit/mixin/xml_escape_spec.rb b/spec/unit/mixin/xml_escape_spec.rb
index d05854ade4..d05854ade4 100644
--- a/chef/spec/unit/mixin/xml_escape_spec.rb
+++ b/spec/unit/mixin/xml_escape_spec.rb
diff --git a/chef/spec/unit/monkey_patches/string_spec.rb b/spec/unit/monkey_patches/string_spec.rb
index 8c6710b38e..8c6710b38e 100644
--- a/chef/spec/unit/monkey_patches/string_spec.rb
+++ b/spec/unit/monkey_patches/string_spec.rb
diff --git a/chef/spec/unit/node/attribute_spec.rb b/spec/unit/node/attribute_spec.rb
index 422b34f252..422b34f252 100644
--- a/chef/spec/unit/node/attribute_spec.rb
+++ b/spec/unit/node/attribute_spec.rb
diff --git a/chef/spec/unit/node/immutable_collections_spec.rb b/spec/unit/node/immutable_collections_spec.rb
index 4ad5313415..4ad5313415 100644
--- a/chef/spec/unit/node/immutable_collections_spec.rb
+++ b/spec/unit/node/immutable_collections_spec.rb
diff --git a/chef/spec/unit/node_spec.rb b/spec/unit/node_spec.rb
index b6f63c9651..b6f63c9651 100644
--- a/chef/spec/unit/node_spec.rb
+++ b/spec/unit/node_spec.rb
diff --git a/chef/spec/unit/platform_spec.rb b/spec/unit/platform_spec.rb
index b09a68b528..b09a68b528 100644
--- a/chef/spec/unit/platform_spec.rb
+++ b/spec/unit/platform_spec.rb
diff --git a/chef/spec/unit/provider/breakpoint_spec.rb b/spec/unit/provider/breakpoint_spec.rb
index 977624597a..977624597a 100644
--- a/chef/spec/unit/provider/breakpoint_spec.rb
+++ b/spec/unit/provider/breakpoint_spec.rb
diff --git a/chef/spec/unit/provider/cookbook_file_spec.rb b/spec/unit/provider/cookbook_file_spec.rb
index c70a7d852c..c70a7d852c 100644
--- a/chef/spec/unit/provider/cookbook_file_spec.rb
+++ b/spec/unit/provider/cookbook_file_spec.rb
diff --git a/chef/spec/unit/provider/cron/solaris_spec.rb b/spec/unit/provider/cron/solaris_spec.rb
index 55516d59e9..55516d59e9 100644
--- a/chef/spec/unit/provider/cron/solaris_spec.rb
+++ b/spec/unit/provider/cron/solaris_spec.rb
diff --git a/chef/spec/unit/provider/cron_spec.rb b/spec/unit/provider/cron_spec.rb
index 5a848a30e6..5a848a30e6 100644
--- a/chef/spec/unit/provider/cron_spec.rb
+++ b/spec/unit/provider/cron_spec.rb
diff --git a/chef/spec/unit/provider/deploy/revision_spec.rb b/spec/unit/provider/deploy/revision_spec.rb
index 396dd09a8e..396dd09a8e 100644
--- a/chef/spec/unit/provider/deploy/revision_spec.rb
+++ b/spec/unit/provider/deploy/revision_spec.rb
diff --git a/chef/spec/unit/provider/deploy/timestamped_spec.rb b/spec/unit/provider/deploy/timestamped_spec.rb
index b891a03ce2..b891a03ce2 100644
--- a/chef/spec/unit/provider/deploy/timestamped_spec.rb
+++ b/spec/unit/provider/deploy/timestamped_spec.rb
diff --git a/chef/spec/unit/provider/deploy_spec.rb b/spec/unit/provider/deploy_spec.rb
index 6bcd64fbfb..6bcd64fbfb 100644
--- a/chef/spec/unit/provider/deploy_spec.rb
+++ b/spec/unit/provider/deploy_spec.rb
diff --git a/chef/spec/unit/provider/directory_spec.rb b/spec/unit/provider/directory_spec.rb
index 4f297e0115..4f297e0115 100644
--- a/chef/spec/unit/provider/directory_spec.rb
+++ b/spec/unit/provider/directory_spec.rb
diff --git a/chef/spec/unit/provider/env_spec.rb b/spec/unit/provider/env_spec.rb
index 77aea42b43..77aea42b43 100644
--- a/chef/spec/unit/provider/env_spec.rb
+++ b/spec/unit/provider/env_spec.rb
diff --git a/chef/spec/unit/provider/erl_call_spec.rb b/spec/unit/provider/erl_call_spec.rb
index df7910424b..df7910424b 100644
--- a/chef/spec/unit/provider/erl_call_spec.rb
+++ b/spec/unit/provider/erl_call_spec.rb
diff --git a/chef/spec/unit/provider/execute_spec.rb b/spec/unit/provider/execute_spec.rb
index a944793a89..a944793a89 100644
--- a/chef/spec/unit/provider/execute_spec.rb
+++ b/spec/unit/provider/execute_spec.rb
diff --git a/chef/spec/unit/provider/file_spec.rb b/spec/unit/provider/file_spec.rb
index 13b79e4bd6..13b79e4bd6 100644
--- a/chef/spec/unit/provider/file_spec.rb
+++ b/spec/unit/provider/file_spec.rb
diff --git a/chef/spec/unit/provider/git_spec.rb b/spec/unit/provider/git_spec.rb
index bb8208dc27..bb8208dc27 100644
--- a/chef/spec/unit/provider/git_spec.rb
+++ b/spec/unit/provider/git_spec.rb
diff --git a/chef/spec/unit/provider/group/dscl_spec.rb b/spec/unit/provider/group/dscl_spec.rb
index b526848dfd..b526848dfd 100644
--- a/chef/spec/unit/provider/group/dscl_spec.rb
+++ b/spec/unit/provider/group/dscl_spec.rb
diff --git a/chef/spec/unit/provider/group/gpasswd_spec.rb b/spec/unit/provider/group/gpasswd_spec.rb
index 59da88e851..59da88e851 100644
--- a/chef/spec/unit/provider/group/gpasswd_spec.rb
+++ b/spec/unit/provider/group/gpasswd_spec.rb
diff --git a/chef/spec/unit/provider/group/groupadd_spec.rb b/spec/unit/provider/group/groupadd_spec.rb
index f08e14f99b..f08e14f99b 100644
--- a/chef/spec/unit/provider/group/groupadd_spec.rb
+++ b/spec/unit/provider/group/groupadd_spec.rb
diff --git a/chef/spec/unit/provider/group/groupmod_spec.rb b/spec/unit/provider/group/groupmod_spec.rb
index c9c56313b5..c9c56313b5 100644
--- a/chef/spec/unit/provider/group/groupmod_spec.rb
+++ b/spec/unit/provider/group/groupmod_spec.rb
diff --git a/chef/spec/unit/provider/group/pw_spec.rb b/spec/unit/provider/group/pw_spec.rb
index a7dbdb8615..a7dbdb8615 100644
--- a/chef/spec/unit/provider/group/pw_spec.rb
+++ b/spec/unit/provider/group/pw_spec.rb
diff --git a/chef/spec/unit/provider/group/usermod_spec.rb b/spec/unit/provider/group/usermod_spec.rb
index 6e6e275a7a..6e6e275a7a 100644
--- a/chef/spec/unit/provider/group/usermod_spec.rb
+++ b/spec/unit/provider/group/usermod_spec.rb
diff --git a/chef/spec/unit/provider/group/windows_spec.rb b/spec/unit/provider/group/windows_spec.rb
index 084d1d0acf..084d1d0acf 100644
--- a/chef/spec/unit/provider/group/windows_spec.rb
+++ b/spec/unit/provider/group/windows_spec.rb
diff --git a/chef/spec/unit/provider/group_spec.rb b/spec/unit/provider/group_spec.rb
index 106a0db14c..106a0db14c 100644
--- a/chef/spec/unit/provider/group_spec.rb
+++ b/spec/unit/provider/group_spec.rb
diff --git a/chef/spec/unit/provider/http_request_spec.rb b/spec/unit/provider/http_request_spec.rb
index 26d73cebb4..26d73cebb4 100644
--- a/chef/spec/unit/provider/http_request_spec.rb
+++ b/spec/unit/provider/http_request_spec.rb
diff --git a/chef/spec/unit/provider/ifconfig_spec.rb b/spec/unit/provider/ifconfig_spec.rb
index 1bf702cf6e..1bf702cf6e 100644
--- a/chef/spec/unit/provider/ifconfig_spec.rb
+++ b/spec/unit/provider/ifconfig_spec.rb
diff --git a/chef/spec/unit/provider/link_spec.rb b/spec/unit/provider/link_spec.rb
index bb3f01abbe..bb3f01abbe 100644
--- a/chef/spec/unit/provider/link_spec.rb
+++ b/spec/unit/provider/link_spec.rb
diff --git a/chef/spec/unit/provider/log_spec.rb b/spec/unit/provider/log_spec.rb
index fe3733240a..fe3733240a 100644
--- a/chef/spec/unit/provider/log_spec.rb
+++ b/spec/unit/provider/log_spec.rb
diff --git a/chef/spec/unit/provider/mdadm_spec.rb b/spec/unit/provider/mdadm_spec.rb
index a818c37101..a818c37101 100644
--- a/chef/spec/unit/provider/mdadm_spec.rb
+++ b/spec/unit/provider/mdadm_spec.rb
diff --git a/chef/spec/unit/provider/mount/mount_spec.rb b/spec/unit/provider/mount/mount_spec.rb
index c497a08e40..c497a08e40 100644
--- a/chef/spec/unit/provider/mount/mount_spec.rb
+++ b/spec/unit/provider/mount/mount_spec.rb
diff --git a/chef/spec/unit/provider/mount/windows_spec.rb b/spec/unit/provider/mount/windows_spec.rb
index f173ebba22..f173ebba22 100644
--- a/chef/spec/unit/provider/mount/windows_spec.rb
+++ b/spec/unit/provider/mount/windows_spec.rb
diff --git a/chef/spec/unit/provider/mount_spec.rb b/spec/unit/provider/mount_spec.rb
index 921bde4cc9..921bde4cc9 100644
--- a/chef/spec/unit/provider/mount_spec.rb
+++ b/spec/unit/provider/mount_spec.rb
diff --git a/chef/spec/unit/provider/ohai_spec.rb b/spec/unit/provider/ohai_spec.rb
index 8402c92e97..8402c92e97 100644
--- a/chef/spec/unit/provider/ohai_spec.rb
+++ b/spec/unit/provider/ohai_spec.rb
diff --git a/chef/spec/unit/provider/package/apt_spec.rb b/spec/unit/provider/package/apt_spec.rb
index 06ada5189e..06ada5189e 100644
--- a/chef/spec/unit/provider/package/apt_spec.rb
+++ b/spec/unit/provider/package/apt_spec.rb
diff --git a/chef/spec/unit/provider/package/dpkg_spec.rb b/spec/unit/provider/package/dpkg_spec.rb
index aa22e0a2a3..aa22e0a2a3 100644
--- a/chef/spec/unit/provider/package/dpkg_spec.rb
+++ b/spec/unit/provider/package/dpkg_spec.rb
diff --git a/chef/spec/unit/provider/package/easy_install_spec.rb b/spec/unit/provider/package/easy_install_spec.rb
index 02f8399af8..02f8399af8 100644
--- a/chef/spec/unit/provider/package/easy_install_spec.rb
+++ b/spec/unit/provider/package/easy_install_spec.rb
diff --git a/chef/spec/unit/provider/package/freebsd_spec.rb b/spec/unit/provider/package/freebsd_spec.rb
index 270c85d934..270c85d934 100644
--- a/chef/spec/unit/provider/package/freebsd_spec.rb
+++ b/spec/unit/provider/package/freebsd_spec.rb
diff --git a/chef/spec/unit/provider/package/ips_spec.rb b/spec/unit/provider/package/ips_spec.rb
index 641a527012..641a527012 100644
--- a/chef/spec/unit/provider/package/ips_spec.rb
+++ b/spec/unit/provider/package/ips_spec.rb
diff --git a/chef/spec/unit/provider/package/macports_spec.rb b/spec/unit/provider/package/macports_spec.rb
index 2f0db3f7a8..2f0db3f7a8 100644
--- a/chef/spec/unit/provider/package/macports_spec.rb
+++ b/spec/unit/provider/package/macports_spec.rb
diff --git a/chef/spec/unit/provider/package/pacman_spec.rb b/spec/unit/provider/package/pacman_spec.rb
index 7e4abcb6d5..7e4abcb6d5 100644
--- a/chef/spec/unit/provider/package/pacman_spec.rb
+++ b/spec/unit/provider/package/pacman_spec.rb
diff --git a/chef/spec/unit/provider/package/portage_spec.rb b/spec/unit/provider/package/portage_spec.rb
index e963934f4f..e963934f4f 100644
--- a/chef/spec/unit/provider/package/portage_spec.rb
+++ b/spec/unit/provider/package/portage_spec.rb
diff --git a/chef/spec/unit/provider/package/rpm_spec.rb b/spec/unit/provider/package/rpm_spec.rb
index 9dd94a7441..9dd94a7441 100644
--- a/chef/spec/unit/provider/package/rpm_spec.rb
+++ b/spec/unit/provider/package/rpm_spec.rb
diff --git a/chef/spec/unit/provider/package/rubygems_spec.rb b/spec/unit/provider/package/rubygems_spec.rb
index be4c3a99c4..be4c3a99c4 100644
--- a/chef/spec/unit/provider/package/rubygems_spec.rb
+++ b/spec/unit/provider/package/rubygems_spec.rb
diff --git a/chef/spec/unit/provider/package/smartos_spec.rb b/spec/unit/provider/package/smartos_spec.rb
index b4cfe7e409..b4cfe7e409 100644
--- a/chef/spec/unit/provider/package/smartos_spec.rb
+++ b/spec/unit/provider/package/smartos_spec.rb
diff --git a/chef/spec/unit/provider/package/solaris_spec.rb b/spec/unit/provider/package/solaris_spec.rb
index dd7cea2aaa..dd7cea2aaa 100644
--- a/chef/spec/unit/provider/package/solaris_spec.rb
+++ b/spec/unit/provider/package/solaris_spec.rb
diff --git a/chef/spec/unit/provider/package/yum_spec.rb b/spec/unit/provider/package/yum_spec.rb
index 0002ec39f3..0002ec39f3 100644
--- a/chef/spec/unit/provider/package/yum_spec.rb
+++ b/spec/unit/provider/package/yum_spec.rb
diff --git a/chef/spec/unit/provider/package/zypper_spec.rb b/spec/unit/provider/package/zypper_spec.rb
index fab78f4917..fab78f4917 100644
--- a/chef/spec/unit/provider/package/zypper_spec.rb
+++ b/spec/unit/provider/package/zypper_spec.rb
diff --git a/chef/spec/unit/provider/package_spec.rb b/spec/unit/provider/package_spec.rb
index 4052bc1ffd..4052bc1ffd 100644
--- a/chef/spec/unit/provider/package_spec.rb
+++ b/spec/unit/provider/package_spec.rb
diff --git a/chef/spec/unit/provider/remote_directory_spec.rb b/spec/unit/provider/remote_directory_spec.rb
index 19a17c269f..19a17c269f 100644
--- a/chef/spec/unit/provider/remote_directory_spec.rb
+++ b/spec/unit/provider/remote_directory_spec.rb
diff --git a/chef/spec/unit/provider/remote_file_spec.rb b/spec/unit/provider/remote_file_spec.rb
index 78d7e77121..78d7e77121 100644
--- a/chef/spec/unit/provider/remote_file_spec.rb
+++ b/spec/unit/provider/remote_file_spec.rb
diff --git a/chef/spec/unit/provider/route_spec.rb b/spec/unit/provider/route_spec.rb
index 3c5db0b7a1..3c5db0b7a1 100644
--- a/chef/spec/unit/provider/route_spec.rb
+++ b/spec/unit/provider/route_spec.rb
diff --git a/chef/spec/unit/provider/ruby_block_spec.rb b/spec/unit/provider/ruby_block_spec.rb
index 7fc58c9c70..7fc58c9c70 100644
--- a/chef/spec/unit/provider/ruby_block_spec.rb
+++ b/spec/unit/provider/ruby_block_spec.rb
diff --git a/chef/spec/unit/provider/script_spec.rb b/spec/unit/provider/script_spec.rb
index 5111a94578..5111a94578 100644
--- a/chef/spec/unit/provider/script_spec.rb
+++ b/spec/unit/provider/script_spec.rb
diff --git a/chef/spec/unit/provider/service/arch_service_spec.rb b/spec/unit/provider/service/arch_service_spec.rb
index a7afa28da1..a7afa28da1 100644
--- a/chef/spec/unit/provider/service/arch_service_spec.rb
+++ b/spec/unit/provider/service/arch_service_spec.rb
diff --git a/chef/spec/unit/provider/service/debian_service_spec.rb b/spec/unit/provider/service/debian_service_spec.rb
index bea9360561..bea9360561 100644
--- a/chef/spec/unit/provider/service/debian_service_spec.rb
+++ b/spec/unit/provider/service/debian_service_spec.rb
diff --git a/chef/spec/unit/provider/service/freebsd_service_spec.rb b/spec/unit/provider/service/freebsd_service_spec.rb
index 6dd06bde2c..6dd06bde2c 100644
--- a/chef/spec/unit/provider/service/freebsd_service_spec.rb
+++ b/spec/unit/provider/service/freebsd_service_spec.rb
diff --git a/chef/spec/unit/provider/service/gentoo_service_spec.rb b/spec/unit/provider/service/gentoo_service_spec.rb
index 8d4ada043b..8d4ada043b 100644
--- a/chef/spec/unit/provider/service/gentoo_service_spec.rb
+++ b/spec/unit/provider/service/gentoo_service_spec.rb
diff --git a/chef/spec/unit/provider/service/init_service_spec.rb b/spec/unit/provider/service/init_service_spec.rb
index 77b22c8cf4..77b22c8cf4 100644
--- a/chef/spec/unit/provider/service/init_service_spec.rb
+++ b/spec/unit/provider/service/init_service_spec.rb
diff --git a/chef/spec/unit/provider/service/insserv_service_spec.rb b/spec/unit/provider/service/insserv_service_spec.rb
index c823d511b5..c823d511b5 100644
--- a/chef/spec/unit/provider/service/insserv_service_spec.rb
+++ b/spec/unit/provider/service/insserv_service_spec.rb
diff --git a/chef/spec/unit/provider/service/invokercd_service_spec.rb b/spec/unit/provider/service/invokercd_service_spec.rb
index ace2ad24e3..ace2ad24e3 100644
--- a/chef/spec/unit/provider/service/invokercd_service_spec.rb
+++ b/spec/unit/provider/service/invokercd_service_spec.rb
diff --git a/chef/spec/unit/provider/service/macosx_spec.rb b/spec/unit/provider/service/macosx_spec.rb
index 9c3ec340a2..9c3ec340a2 100644
--- a/chef/spec/unit/provider/service/macosx_spec.rb
+++ b/spec/unit/provider/service/macosx_spec.rb
diff --git a/chef/spec/unit/provider/service/redhat_spec.rb b/spec/unit/provider/service/redhat_spec.rb
index dd874a4f05..dd874a4f05 100644
--- a/chef/spec/unit/provider/service/redhat_spec.rb
+++ b/spec/unit/provider/service/redhat_spec.rb
diff --git a/chef/spec/unit/provider/service/simple_service_spec.rb b/spec/unit/provider/service/simple_service_spec.rb
index cc0173e246..cc0173e246 100644
--- a/chef/spec/unit/provider/service/simple_service_spec.rb
+++ b/spec/unit/provider/service/simple_service_spec.rb
diff --git a/chef/spec/unit/provider/service/solaris_smf_service_spec.rb b/spec/unit/provider/service/solaris_smf_service_spec.rb
index 3ea2902755..3ea2902755 100644
--- a/chef/spec/unit/provider/service/solaris_smf_service_spec.rb
+++ b/spec/unit/provider/service/solaris_smf_service_spec.rb
diff --git a/chef/spec/unit/provider/service/systemd_service_spec.rb b/spec/unit/provider/service/systemd_service_spec.rb
index dbdedecd40..dbdedecd40 100644
--- a/chef/spec/unit/provider/service/systemd_service_spec.rb
+++ b/spec/unit/provider/service/systemd_service_spec.rb
diff --git a/chef/spec/unit/provider/service/upstart_service_spec.rb b/spec/unit/provider/service/upstart_service_spec.rb
index 2fc49c7aa2..2fc49c7aa2 100644
--- a/chef/spec/unit/provider/service/upstart_service_spec.rb
+++ b/spec/unit/provider/service/upstart_service_spec.rb
diff --git a/chef/spec/unit/provider/service/windows_spec.rb b/spec/unit/provider/service/windows_spec.rb
index a68e798d36..a68e798d36 100644
--- a/chef/spec/unit/provider/service/windows_spec.rb
+++ b/spec/unit/provider/service/windows_spec.rb
diff --git a/chef/spec/unit/provider/service_spec.rb b/spec/unit/provider/service_spec.rb
index d25d7cf735..d25d7cf735 100644
--- a/chef/spec/unit/provider/service_spec.rb
+++ b/spec/unit/provider/service_spec.rb
diff --git a/chef/spec/unit/provider/subversion_spec.rb b/spec/unit/provider/subversion_spec.rb
index e441428d6c..e441428d6c 100644
--- a/chef/spec/unit/provider/subversion_spec.rb
+++ b/spec/unit/provider/subversion_spec.rb
diff --git a/chef/spec/unit/provider/template_spec.rb b/spec/unit/provider/template_spec.rb
index 6747876d61..6747876d61 100644
--- a/chef/spec/unit/provider/template_spec.rb
+++ b/spec/unit/provider/template_spec.rb
diff --git a/chef/spec/unit/provider/user/dscl_spec.rb b/spec/unit/provider/user/dscl_spec.rb
index 3894cd61b4..3894cd61b4 100644
--- a/chef/spec/unit/provider/user/dscl_spec.rb
+++ b/spec/unit/provider/user/dscl_spec.rb
diff --git a/chef/spec/unit/provider/user/pw_spec.rb b/spec/unit/provider/user/pw_spec.rb
index b7503ea15f..b7503ea15f 100644
--- a/chef/spec/unit/provider/user/pw_spec.rb
+++ b/spec/unit/provider/user/pw_spec.rb
diff --git a/chef/spec/unit/provider/user/useradd_spec.rb b/spec/unit/provider/user/useradd_spec.rb
index ea6caf6e0a..ea6caf6e0a 100644
--- a/chef/spec/unit/provider/user/useradd_spec.rb
+++ b/spec/unit/provider/user/useradd_spec.rb
diff --git a/chef/spec/unit/provider/user/windows_spec.rb b/spec/unit/provider/user/windows_spec.rb
index 6ede11b28c..6ede11b28c 100644
--- a/chef/spec/unit/provider/user/windows_spec.rb
+++ b/spec/unit/provider/user/windows_spec.rb
diff --git a/chef/spec/unit/provider/user_spec.rb b/spec/unit/provider/user_spec.rb
index 4066ffd7fe..4066ffd7fe 100644
--- a/chef/spec/unit/provider/user_spec.rb
+++ b/spec/unit/provider/user_spec.rb
diff --git a/chef/spec/unit/provider_spec.rb b/spec/unit/provider_spec.rb
index b0edf492ab..b0edf492ab 100644
--- a/chef/spec/unit/provider_spec.rb
+++ b/spec/unit/provider_spec.rb
diff --git a/chef/spec/unit/recipe_spec.rb b/spec/unit/recipe_spec.rb
index 4615bcb4d4..4615bcb4d4 100644
--- a/chef/spec/unit/recipe_spec.rb
+++ b/spec/unit/recipe_spec.rb
diff --git a/chef/spec/unit/resource/apt_package_spec.rb b/spec/unit/resource/apt_package_spec.rb
index 795ffc6fc4..795ffc6fc4 100644
--- a/chef/spec/unit/resource/apt_package_spec.rb
+++ b/spec/unit/resource/apt_package_spec.rb
diff --git a/chef/spec/unit/resource/bash_spec.rb b/spec/unit/resource/bash_spec.rb
index c7f31e1de6..c7f31e1de6 100644
--- a/chef/spec/unit/resource/bash_spec.rb
+++ b/spec/unit/resource/bash_spec.rb
diff --git a/chef/spec/unit/resource/breakpoint_spec.rb b/spec/unit/resource/breakpoint_spec.rb
index 8eaabb546d..8eaabb546d 100644
--- a/chef/spec/unit/resource/breakpoint_spec.rb
+++ b/spec/unit/resource/breakpoint_spec.rb
diff --git a/chef/spec/unit/resource/chef_gem_spec.rb b/spec/unit/resource/chef_gem_spec.rb
index 54def9a49d..54def9a49d 100644
--- a/chef/spec/unit/resource/chef_gem_spec.rb
+++ b/spec/unit/resource/chef_gem_spec.rb
diff --git a/chef/spec/unit/resource/conditional_spec.rb b/spec/unit/resource/conditional_spec.rb
index 1be7bcea71..1be7bcea71 100644
--- a/chef/spec/unit/resource/conditional_spec.rb
+++ b/spec/unit/resource/conditional_spec.rb
diff --git a/chef/spec/unit/resource/cookbook_file_spec.rb b/spec/unit/resource/cookbook_file_spec.rb
index d0408c251a..d0408c251a 100644
--- a/chef/spec/unit/resource/cookbook_file_spec.rb
+++ b/spec/unit/resource/cookbook_file_spec.rb
diff --git a/chef/spec/unit/resource/cron_spec.rb b/spec/unit/resource/cron_spec.rb
index 403ffb009b..403ffb009b 100644
--- a/chef/spec/unit/resource/cron_spec.rb
+++ b/spec/unit/resource/cron_spec.rb
diff --git a/chef/spec/unit/resource/csh_spec.rb b/spec/unit/resource/csh_spec.rb
index 291c6ea745..291c6ea745 100644
--- a/chef/spec/unit/resource/csh_spec.rb
+++ b/spec/unit/resource/csh_spec.rb
diff --git a/chef/spec/unit/resource/deploy_revision_spec.rb b/spec/unit/resource/deploy_revision_spec.rb
index 671ba9a1f6..671ba9a1f6 100644
--- a/chef/spec/unit/resource/deploy_revision_spec.rb
+++ b/spec/unit/resource/deploy_revision_spec.rb
diff --git a/chef/spec/unit/resource/deploy_spec.rb b/spec/unit/resource/deploy_spec.rb
index 98c9fa1581..98c9fa1581 100644
--- a/chef/spec/unit/resource/deploy_spec.rb
+++ b/spec/unit/resource/deploy_spec.rb
diff --git a/chef/spec/unit/resource/directory_spec.rb b/spec/unit/resource/directory_spec.rb
index 9b0c8242e6..9b0c8242e6 100644
--- a/chef/spec/unit/resource/directory_spec.rb
+++ b/spec/unit/resource/directory_spec.rb
diff --git a/chef/spec/unit/resource/dpkg_package_spec.rb b/spec/unit/resource/dpkg_package_spec.rb
index 000908712f..000908712f 100644
--- a/chef/spec/unit/resource/dpkg_package_spec.rb
+++ b/spec/unit/resource/dpkg_package_spec.rb
diff --git a/chef/spec/unit/resource/easy_install_package_spec.rb b/spec/unit/resource/easy_install_package_spec.rb
index 9682c8177b..9682c8177b 100644
--- a/chef/spec/unit/resource/easy_install_package_spec.rb
+++ b/spec/unit/resource/easy_install_package_spec.rb
diff --git a/chef/spec/unit/resource/env_spec.rb b/spec/unit/resource/env_spec.rb
index 6862c669b2..6862c669b2 100644
--- a/chef/spec/unit/resource/env_spec.rb
+++ b/spec/unit/resource/env_spec.rb
diff --git a/chef/spec/unit/resource/erl_call_spec.rb b/spec/unit/resource/erl_call_spec.rb
index ccad371723..ccad371723 100644
--- a/chef/spec/unit/resource/erl_call_spec.rb
+++ b/spec/unit/resource/erl_call_spec.rb
diff --git a/chef/spec/unit/resource/execute_spec.rb b/spec/unit/resource/execute_spec.rb
index 0dcdab7409..0dcdab7409 100644
--- a/chef/spec/unit/resource/execute_spec.rb
+++ b/spec/unit/resource/execute_spec.rb
diff --git a/chef/spec/unit/resource/file_spec.rb b/spec/unit/resource/file_spec.rb
index 58a7bd68b3..58a7bd68b3 100644
--- a/chef/spec/unit/resource/file_spec.rb
+++ b/spec/unit/resource/file_spec.rb
diff --git a/chef/spec/unit/resource/freebsd_package_spec.rb b/spec/unit/resource/freebsd_package_spec.rb
index 697f5fff06..697f5fff06 100644
--- a/chef/spec/unit/resource/freebsd_package_spec.rb
+++ b/spec/unit/resource/freebsd_package_spec.rb
diff --git a/chef/spec/unit/resource/gem_package_spec.rb b/spec/unit/resource/gem_package_spec.rb
index 2404afa03a..2404afa03a 100644
--- a/chef/spec/unit/resource/gem_package_spec.rb
+++ b/spec/unit/resource/gem_package_spec.rb
diff --git a/chef/spec/unit/resource/git_spec.rb b/spec/unit/resource/git_spec.rb
index 69b40ffd42..69b40ffd42 100644
--- a/chef/spec/unit/resource/git_spec.rb
+++ b/spec/unit/resource/git_spec.rb
diff --git a/chef/spec/unit/resource/group_spec.rb b/spec/unit/resource/group_spec.rb
index 7181750b1c..7181750b1c 100644
--- a/chef/spec/unit/resource/group_spec.rb
+++ b/spec/unit/resource/group_spec.rb
diff --git a/chef/spec/unit/resource/http_request_spec.rb b/spec/unit/resource/http_request_spec.rb
index 924cf66fc2..924cf66fc2 100644
--- a/chef/spec/unit/resource/http_request_spec.rb
+++ b/spec/unit/resource/http_request_spec.rb
diff --git a/chef/spec/unit/resource/ifconfig_spec.rb b/spec/unit/resource/ifconfig_spec.rb
index 2aac130978..2aac130978 100644
--- a/chef/spec/unit/resource/ifconfig_spec.rb
+++ b/spec/unit/resource/ifconfig_spec.rb
diff --git a/chef/spec/unit/resource/ips_package_spec.rb b/spec/unit/resource/ips_package_spec.rb
index 92e62606de..92e62606de 100644
--- a/chef/spec/unit/resource/ips_package_spec.rb
+++ b/spec/unit/resource/ips_package_spec.rb
diff --git a/chef/spec/unit/resource/link_spec.rb b/spec/unit/resource/link_spec.rb
index 279a5b4e77..279a5b4e77 100644
--- a/chef/spec/unit/resource/link_spec.rb
+++ b/spec/unit/resource/link_spec.rb
diff --git a/chef/spec/unit/resource/log_spec.rb b/spec/unit/resource/log_spec.rb
index bc5ac13078..bc5ac13078 100644
--- a/chef/spec/unit/resource/log_spec.rb
+++ b/spec/unit/resource/log_spec.rb
diff --git a/chef/spec/unit/resource/macports_package_spec.rb b/spec/unit/resource/macports_package_spec.rb
index 7420fafeb5..7420fafeb5 100644
--- a/chef/spec/unit/resource/macports_package_spec.rb
+++ b/spec/unit/resource/macports_package_spec.rb
diff --git a/chef/spec/unit/resource/mdadm_spec.rb b/spec/unit/resource/mdadm_spec.rb
index c4e6704ceb..c4e6704ceb 100644
--- a/chef/spec/unit/resource/mdadm_spec.rb
+++ b/spec/unit/resource/mdadm_spec.rb
diff --git a/chef/spec/unit/resource/mount_spec.rb b/spec/unit/resource/mount_spec.rb
index 498f33a7ba..498f33a7ba 100644
--- a/chef/spec/unit/resource/mount_spec.rb
+++ b/spec/unit/resource/mount_spec.rb
diff --git a/chef/spec/unit/resource/ohai_spec.rb b/spec/unit/resource/ohai_spec.rb
index 82df61e509..82df61e509 100644
--- a/chef/spec/unit/resource/ohai_spec.rb
+++ b/spec/unit/resource/ohai_spec.rb
diff --git a/chef/spec/unit/resource/package_spec.rb b/spec/unit/resource/package_spec.rb
index 3f9cc7a408..3f9cc7a408 100644
--- a/chef/spec/unit/resource/package_spec.rb
+++ b/spec/unit/resource/package_spec.rb
diff --git a/chef/spec/unit/resource/pacman_package_spec.rb b/spec/unit/resource/pacman_package_spec.rb
index 53ecd296c9..53ecd296c9 100644
--- a/chef/spec/unit/resource/pacman_package_spec.rb
+++ b/spec/unit/resource/pacman_package_spec.rb
diff --git a/chef/spec/unit/resource/perl_spec.rb b/spec/unit/resource/perl_spec.rb
index f0313e6fb9..f0313e6fb9 100644
--- a/chef/spec/unit/resource/perl_spec.rb
+++ b/spec/unit/resource/perl_spec.rb
diff --git a/chef/spec/unit/resource/portage_package_spec.rb b/spec/unit/resource/portage_package_spec.rb
index da086d95ba..da086d95ba 100644
--- a/chef/spec/unit/resource/portage_package_spec.rb
+++ b/spec/unit/resource/portage_package_spec.rb
diff --git a/chef/spec/unit/resource/python_spec.rb b/spec/unit/resource/python_spec.rb
index ff9547db9a..ff9547db9a 100644
--- a/chef/spec/unit/resource/python_spec.rb
+++ b/spec/unit/resource/python_spec.rb
diff --git a/chef/spec/unit/resource/remote_directory_spec.rb b/spec/unit/resource/remote_directory_spec.rb
index e4fa8fc4e3..e4fa8fc4e3 100644
--- a/chef/spec/unit/resource/remote_directory_spec.rb
+++ b/spec/unit/resource/remote_directory_spec.rb
diff --git a/chef/spec/unit/resource/remote_file_spec.rb b/spec/unit/resource/remote_file_spec.rb
index d91f80d1a7..d91f80d1a7 100644
--- a/chef/spec/unit/resource/remote_file_spec.rb
+++ b/spec/unit/resource/remote_file_spec.rb
diff --git a/chef/spec/unit/resource/route_spec.rb b/spec/unit/resource/route_spec.rb
index 54d5275411..54d5275411 100644
--- a/chef/spec/unit/resource/route_spec.rb
+++ b/spec/unit/resource/route_spec.rb
diff --git a/chef/spec/unit/resource/rpm_package_spec.rb b/spec/unit/resource/rpm_package_spec.rb
index d59dc6b29c..d59dc6b29c 100644
--- a/chef/spec/unit/resource/rpm_package_spec.rb
+++ b/spec/unit/resource/rpm_package_spec.rb
diff --git a/chef/spec/unit/resource/ruby_block_spec.rb b/spec/unit/resource/ruby_block_spec.rb
index 637d4fe34d..637d4fe34d 100644
--- a/chef/spec/unit/resource/ruby_block_spec.rb
+++ b/spec/unit/resource/ruby_block_spec.rb
diff --git a/chef/spec/unit/resource/ruby_spec.rb b/spec/unit/resource/ruby_spec.rb
index 48dfd90898..48dfd90898 100644
--- a/chef/spec/unit/resource/ruby_spec.rb
+++ b/spec/unit/resource/ruby_spec.rb
diff --git a/chef/spec/unit/resource/scm_spec.rb b/spec/unit/resource/scm_spec.rb
index 488d335342..488d335342 100644
--- a/chef/spec/unit/resource/scm_spec.rb
+++ b/spec/unit/resource/scm_spec.rb
diff --git a/chef/spec/unit/resource/script_spec.rb b/spec/unit/resource/script_spec.rb
index 569602008b..569602008b 100644
--- a/chef/spec/unit/resource/script_spec.rb
+++ b/spec/unit/resource/script_spec.rb
diff --git a/chef/spec/unit/resource/service_spec.rb b/spec/unit/resource/service_spec.rb
index d7a90e8c7a..d7a90e8c7a 100644
--- a/chef/spec/unit/resource/service_spec.rb
+++ b/spec/unit/resource/service_spec.rb
diff --git a/chef/spec/unit/resource/smartos_package_spec.rb b/spec/unit/resource/smartos_package_spec.rb
index ca815320ad..ca815320ad 100644
--- a/chef/spec/unit/resource/smartos_package_spec.rb
+++ b/spec/unit/resource/smartos_package_spec.rb
diff --git a/chef/spec/unit/resource/subversion_spec.rb b/spec/unit/resource/subversion_spec.rb
index 650eb010a6..650eb010a6 100644
--- a/chef/spec/unit/resource/subversion_spec.rb
+++ b/spec/unit/resource/subversion_spec.rb
diff --git a/chef/spec/unit/resource/template_spec.rb b/spec/unit/resource/template_spec.rb
index f3313611db..f3313611db 100644
--- a/chef/spec/unit/resource/template_spec.rb
+++ b/spec/unit/resource/template_spec.rb
diff --git a/chef/spec/unit/resource/timestamped_deploy_spec.rb b/spec/unit/resource/timestamped_deploy_spec.rb
index 89b881830a..89b881830a 100644
--- a/chef/spec/unit/resource/timestamped_deploy_spec.rb
+++ b/spec/unit/resource/timestamped_deploy_spec.rb
diff --git a/chef/spec/unit/resource/user_spec.rb b/spec/unit/resource/user_spec.rb
index 3361921173..3361921173 100644
--- a/chef/spec/unit/resource/user_spec.rb
+++ b/spec/unit/resource/user_spec.rb
diff --git a/chef/spec/unit/resource/yum_package_spec.rb b/spec/unit/resource/yum_package_spec.rb
index a0f4aaee55..a0f4aaee55 100644
--- a/chef/spec/unit/resource/yum_package_spec.rb
+++ b/spec/unit/resource/yum_package_spec.rb
diff --git a/chef/spec/unit/resource_collection/stepable_iterator_spec.rb b/spec/unit/resource_collection/stepable_iterator_spec.rb
index 1da9de20cc..1da9de20cc 100644
--- a/chef/spec/unit/resource_collection/stepable_iterator_spec.rb
+++ b/spec/unit/resource_collection/stepable_iterator_spec.rb
diff --git a/chef/spec/unit/resource_collection_spec.rb b/spec/unit/resource_collection_spec.rb
index 909ba71e00..909ba71e00 100644
--- a/chef/spec/unit/resource_collection_spec.rb
+++ b/spec/unit/resource_collection_spec.rb
diff --git a/chef/spec/unit/resource_definition_spec.rb b/spec/unit/resource_definition_spec.rb
index a29c15a1e3..a29c15a1e3 100644
--- a/chef/spec/unit/resource_definition_spec.rb
+++ b/spec/unit/resource_definition_spec.rb
diff --git a/chef/spec/unit/resource_platform_map_spec.rb b/spec/unit/resource_platform_map_spec.rb
index 99673d868f..99673d868f 100644
--- a/chef/spec/unit/resource_platform_map_spec.rb
+++ b/spec/unit/resource_platform_map_spec.rb
diff --git a/chef/spec/unit/resource_reporter_spec.rb b/spec/unit/resource_reporter_spec.rb
index bc8e3995f7..bc8e3995f7 100644
--- a/chef/spec/unit/resource_reporter_spec.rb
+++ b/spec/unit/resource_reporter_spec.rb
diff --git a/chef/spec/unit/resource_spec.rb b/spec/unit/resource_spec.rb
index 71d8a4cccf..71d8a4cccf 100644
--- a/chef/spec/unit/resource_spec.rb
+++ b/spec/unit/resource_spec.rb
diff --git a/chef/spec/unit/rest/auth_credentials_spec.rb b/spec/unit/rest/auth_credentials_spec.rb
index d4e533919f..d4e533919f 100644
--- a/chef/spec/unit/rest/auth_credentials_spec.rb
+++ b/spec/unit/rest/auth_credentials_spec.rb
diff --git a/chef/spec/unit/rest_spec.rb b/spec/unit/rest_spec.rb
index 5eacf89eed..5eacf89eed 100644
--- a/chef/spec/unit/rest_spec.rb
+++ b/spec/unit/rest_spec.rb
diff --git a/chef/spec/unit/role_spec.rb b/spec/unit/role_spec.rb
index 764d586903..764d586903 100644
--- a/chef/spec/unit/role_spec.rb
+++ b/spec/unit/role_spec.rb
diff --git a/chef/spec/unit/run_context_spec.rb b/spec/unit/run_context_spec.rb
index 51fa0e81f9..51fa0e81f9 100644
--- a/chef/spec/unit/run_context_spec.rb
+++ b/spec/unit/run_context_spec.rb
diff --git a/chef/spec/unit/run_list/run_list_expansion_spec.rb b/spec/unit/run_list/run_list_expansion_spec.rb
index 012ee9ea31..012ee9ea31 100644
--- a/chef/spec/unit/run_list/run_list_expansion_spec.rb
+++ b/spec/unit/run_list/run_list_expansion_spec.rb
diff --git a/chef/spec/unit/run_list/run_list_item_spec.rb b/spec/unit/run_list/run_list_item_spec.rb
index 62a17aa761..62a17aa761 100644
--- a/chef/spec/unit/run_list/run_list_item_spec.rb
+++ b/spec/unit/run_list/run_list_item_spec.rb
diff --git a/chef/spec/unit/run_list/versioned_recipe_list_spec.rb b/spec/unit/run_list/versioned_recipe_list_spec.rb
index 5cef32c32b..5cef32c32b 100644
--- a/chef/spec/unit/run_list/versioned_recipe_list_spec.rb
+++ b/spec/unit/run_list/versioned_recipe_list_spec.rb
diff --git a/chef/spec/unit/run_list_spec.rb b/spec/unit/run_list_spec.rb
index f18f21a82b..f18f21a82b 100644
--- a/chef/spec/unit/run_list_spec.rb
+++ b/spec/unit/run_list_spec.rb
diff --git a/chef/spec/unit/run_lock_spec.rb b/spec/unit/run_lock_spec.rb
index 4e62b110b9..4e62b110b9 100644
--- a/chef/spec/unit/run_lock_spec.rb
+++ b/spec/unit/run_lock_spec.rb
diff --git a/chef/spec/unit/run_status_spec.rb b/spec/unit/run_status_spec.rb
index 049b86cf54..049b86cf54 100644
--- a/chef/spec/unit/run_status_spec.rb
+++ b/spec/unit/run_status_spec.rb
diff --git a/chef/spec/unit/runner_spec.rb b/spec/unit/runner_spec.rb
index 388596e350..388596e350 100644
--- a/chef/spec/unit/runner_spec.rb
+++ b/spec/unit/runner_spec.rb
diff --git a/chef/spec/unit/scan_access_control_spec.rb b/spec/unit/scan_access_control_spec.rb
index 00e2e2669a..00e2e2669a 100644
--- a/chef/spec/unit/scan_access_control_spec.rb
+++ b/spec/unit/scan_access_control_spec.rb
diff --git a/chef/spec/unit/search/query_spec.rb b/spec/unit/search/query_spec.rb
index e32bed697c..e32bed697c 100644
--- a/chef/spec/unit/search/query_spec.rb
+++ b/spec/unit/search/query_spec.rb
diff --git a/chef/spec/unit/shell/model_wrapper_spec.rb b/spec/unit/shell/model_wrapper_spec.rb
index 35dc591edc..35dc591edc 100644
--- a/chef/spec/unit/shell/model_wrapper_spec.rb
+++ b/spec/unit/shell/model_wrapper_spec.rb
diff --git a/chef/spec/unit/shell/shell_ext_spec.rb b/spec/unit/shell/shell_ext_spec.rb
index 22e9ae674b..22e9ae674b 100644
--- a/chef/spec/unit/shell/shell_ext_spec.rb
+++ b/spec/unit/shell/shell_ext_spec.rb
diff --git a/chef/spec/unit/shell/shell_session_spec.rb b/spec/unit/shell/shell_session_spec.rb
index 3d4081e583..3d4081e583 100644
--- a/chef/spec/unit/shell/shell_session_spec.rb
+++ b/spec/unit/shell/shell_session_spec.rb
diff --git a/chef/spec/unit/shell_out_spec.rb b/spec/unit/shell_out_spec.rb
index 1330dd16de..1330dd16de 100644
--- a/chef/spec/unit/shell_out_spec.rb
+++ b/spec/unit/shell_out_spec.rb
diff --git a/chef/spec/unit/shell_spec.rb b/spec/unit/shell_spec.rb
index fd4241732f..fd4241732f 100644
--- a/chef/spec/unit/shell_spec.rb
+++ b/spec/unit/shell_spec.rb
diff --git a/chef/spec/unit/util/file_edit_spec.rb b/spec/unit/util/file_edit_spec.rb
index 3cf60172d9..3cf60172d9 100644
--- a/chef/spec/unit/util/file_edit_spec.rb
+++ b/spec/unit/util/file_edit_spec.rb
diff --git a/chef/spec/unit/version_class_spec.rb b/spec/unit/version_class_spec.rb
index 285588b031..285588b031 100644
--- a/chef/spec/unit/version_class_spec.rb
+++ b/spec/unit/version_class_spec.rb
diff --git a/chef/spec/unit/version_constraint_spec.rb b/spec/unit/version_constraint_spec.rb
index aea7001f2b..aea7001f2b 100644
--- a/chef/spec/unit/version_constraint_spec.rb
+++ b/spec/unit/version_constraint_spec.rb
diff --git a/chef/tasks/rspec.rb b/tasks/rspec.rb
index 95ae274955..95ae274955 100644
--- a/chef/tasks/rspec.rb
+++ b/tasks/rspec.rb
diff --git a/chef/template-test.rb b/template-test.rb
index bc227164f6..bc227164f6 100644
--- a/chef/template-test.rb
+++ b/template-test.rb