fixes from code review
fix compile
Revert "minor: temporarily disable client_tests"

This reverts commit 5a18632450419fb73b0175f5dc24feddec4bbebe.
Revert "minor: temporarily add a shutdown period to authTest example"

This reverts commit f6f3201a74ce35e99ffeccfc1244120968fb1366.
fix deadlock
split global lock into setsLock and watcherLock