Name the directory watcher thread.
Merge branch 'develop' into feature/websocket-support-glassfish3