Fix bug with mod_watch in supervisor modules

* Also adds __virtual__ support to supervisord exec module

* Closes #6692

Remove uneeded module.

Don't run supervisord tests without supervisord

Fix state test.

Pulled in an old pylint breakage.