Upgrade to Ohai 7-syntax