Better fix for watcher deadlock

Create a new mutex to synchronize around setting up new watchers to prevent
deadlock with zk lock.