Merge "Fix WatchServiceTest.test_singleFile flakiness."