pkg/watch: fix potential deadlock
pkg/watch: deadlock test
Merge pull request #1321 from abursavich/master

pkg/watch: fix potential deadlock