Fixed bug in getting leader for watchdog.
Merge branch 'test' into dev