Issue #2669256 by oadaeh, Kristen Pol, Patrick Storey: Add watchdog entry when module is activated and inactivated