Update the log message in service_manager.
Merge pull request #671 from opscode/service_manager_log

Update the log message in service_manager.
[CHEF-2682] raise exception on non-GET/HEAD redirects
[CHEF-2682] add test case for InvalidRedirect exception
Merge branch 'CHEF-2682'
diff disabling: the config value is :diff_disabled
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
Merge branch 'master' into file-refactor