Pickup omnibus-software change that removes the ohai software definition.