adding an extra test and removing the OS specific checks in WatchServices since it only depends on whether the class/field is available