fs: make unwatchFile() insensitive to path
Merge remote-tracking branch 'upstream/v0.10' into v0.10