Missed 2.0 when removing compaction from CI
Match SCUpgrade node shutdown behavior across all tests