Gracefully stop circus watcher

Refs #515