Windows file watching performance improvement



<!---
@huboard:{"order":851.0,"milestone_order":989,"custom_state":""}
-->