Add an offset in the thread watcher in the service checks, fix #632
Merge branch 'master' into jmxfetch