Fix chef spec infra to use OHAI correctly.
Fix the Ohai resource for Ohai 7.

Conflicts:
	spec/unit/provider/ohai_spec.rb
Remove the unneeded running of "os" plugin.