refs #827 Push the actual change that manages kill_ns() properly