Revert commit fb763d
Revert commit fb763d

This commit completely breaks the salt-master on all non-Linux systems:

https://github.com/saltstack/salt/commit/fb763d91e8189bb73a2c24916093cc06896d251f

Why?

_hw_data(osdata) is called before `osdata` includes the key 'kernel', resulting
in a KeyError.  Steps to reproduce:

(saltenv) $ salt-master -l debug

saltstack/salt,saltstack/salt,saltstack/salt,saltstack/salt,saltstack/salt