Supervisord mod_watch fix

* Also adds ```__virtual__``` support to supervisord exec module

* Closes #6692