CHEF-3895: Add Chef::Checksum to JSON class hack
Merge branch 'master' into 11-stable
Merge branch 'master' into 11-stable

CHEF-1707
CHEF-2467
CHEF-2694
CHEF-3348
CHEF-3364
CHEF-3367
CHEF-3386
CHEF-3432
CHEF-3452
CHEF-3516
CHEF-3615
CHEF-3683
CHEF-3735
CHEF-3772
CHEF-3803
CHEF-3804
CHEF-3819
CHEF-3847
CHEF-3858
CHEF-3872
CHEF-3895
CHEF-3919
CHEF-3920
CHEF-3932
CHEF-3937
CHEF-3938
CHEF-3963
CHEF-3967
CHEF-3987
CHEF-4010
CHEF-4011
CHEF-4065
CHEF-4106
CHEF-4117
CHEF-4118
CHEF-4123
CHEF-4157
CHEF-4176
ruby >= 1.9 is more useful than ruby == 1.9 in a ruby 1.9+2.0 world
many bugs:
- multiline is_binary? regex was broken
- multiline rspec tests were all broken
- Tempfile.new was a big no-op on several tests
- lots of support for handling different encodings and UTF-8 output
add some comments
fix 1.9 mixlib-shellout encoding issues
confusingly named var
fix spec test for ruby-2.0
diff without argument does not read in 8-bit
Merge pull request #863 from opscode/lcg/diff-encoding

Lcg/diff encoding
Use symlink source when inspecting current permissions

Fixes CHEF-4341 http://tickets.opscode.com/browse/CHEF-4341

When manage_symlink_source is enabled, File providers update
current_resource with the security attributes of the source file.
Subsequent actions (e.g., running FileAccessControl) use the values set
on current_resource to determine if they need to modify the system, so
setting them incorrect leads to a file resource being (not) updated
incorrectly.
Merge branch 'CHEF-4341'
Revert "Merge pull request #812 from opscode/lcg/CHEF-3307-empty-string-fix"

This reverts commit 439980b12ed78eb5f61c52cf0d23d4a9205d1011, reversing
changes made to de4d8e66be3dee3ccd9ac027e6332e0eb37f532e.
Revert "Merge branch 'CHEF-3307'"

This reverts commit 5713a002062c762e40e4378be6d7763eb3dd61a2, reversing
changes made to 4079a344f2001c1927132e7ed6b63453f459609f.

Conflicts:
	spec/unit/cookbook_loader_spec.rb
Merge branch 'CHEF-3307-revert'
Fix test expectations for windows file separators
this should have been reverted to old behavior, causes failures on
solaris
Merge pull request #874 from opscode/diff-solaris-rspec-fix

this should have been reverted to old behavior, causes failures on
Bump chef version number to 11.6.0.rc.1