Disable diffs during file functional tests

No functional tests actually use the diff behavior and this speeds them
up quite a bit.
avoid clobbering original diff disable state when nested
forcibly turn diffing back on after diff tests
Support Win8/2k12 versions
Spec test to validate version.rb
minor fix. Check host caption
Merge branch 'adamed-oc-6536-clogeny-merge' of github.com:opscode/chef into adamed-oc-6536-clogeny-merge
Merge pull request #694 from opscode/adamed-oc-6536-clogeny-merge

OC-6536: Update Windows Versions library to include latest versions of Windows
Fix the service_manager_tests on commit verification pipeline
Merge pull request #695 from opscode/ss/service_manager_test_fix

Fix the service_manager_tests on commit verification pipeline
[CHEF-3683] Chef::Node objects should be sortable.

This commit adds a simple <=> method which will allow for Chef::Node
objects to be ordered based on their name.  The primary use case is
sorting arrays of nodes for use in templates.
[CHEF-3683] Assert entire order in test.
fix for chef 3386
Merge branch 'CHEF-3386'
Move the tests for --use-sudo-password to a separate context