Generalize stopping after supervisor finishes

This will allow other services to be stopped after supervisor stops