Gracefully stop circus watcher - NO MERGE FOR NOW

**DO NOT MERGE NOW**

Refs #515