Wan watchdogs

Hi Zachary,
This pulls in the wan watchdog to fix the G(reen)FOD.

Until it is merged the CFOD will be replaced by the GFOD.

Once this is merged all should be good. 

I will look at the changes that have occurred in spark.master and see if we have any redundant fixes