FORGE-1592: Migrated to JDK7 WatchService