Revert "Trimmed the branch to only the neo_watchdogs sub directory"

This reverts commit 465ca89436e8f53dae52bfb4e431a428a1dd2fc8.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the neo_watchdogs sub directory