Only include chef-service-manager on windows
update man pages for chef-client 12
update html pages for chef-client 12
Merge pull request #2273 from opscode/jdmundrawala/gemspec

Only include chef-service-manager on windows
Change the integration test server port from 8889 to 8890 so the test can succeed when
being run from a Chef recipe (specifically chef-zero in test-kitchen).
Bring in cheffish and provisioning resources if they are installed
Merge branch 'master' into mcquin/rspec-3
Don't populate X-Chef-Version.