fix watchdog remove servers bugs and add test cases for application filters

Change-Id: I954c70a2cf3f6edc7530db222e2e3c862dda3f24