Ensure that in-repo addons are watched.
Merge pull request #2451 from rwjblue/ensure-in-repo-addons-are-watched

Ensure that in-repo addons are watched.