FS-5642 --resolve add back the ETIMEDOUT check, needed on Mac