https://issues.apache.org/jira/browse/EXTSCRIPT-139 first part of the data watchdog data structure rework done, all tests pass the system still works, looks good