Merge "WatchServiceTest#test_multipleKeys fix"