Port #6066 to release-1.7 branch - #6071

Dec 12, 2015

Port #6066 to release-1.7 branch#6071
Zhengbo Li (zhengbli) merged 1 commit into
microsoft:release-1.7from
zhengbli:port6066to17

Rollback to polling file watching