Deprecate the 'service' attribute
Extend the OK statuses

This ensures we only find machines that are not in proper states