Fix watch by namespace
Merge pull request #2074 from derekwaynecarr/ns_watch

Fix watch by namespace