Minor correction on WatchDog and gvpn_controller

 - Corrected all pointed out watchdog and gvpn-controller code