Added clean-up code to file observer tests, so that all watch handles

are released before the next test is run, and modified
Java7FileModificationService.close() so it becomes a synchronous
blocking method we can rely on to have worked by the time it returns.