Replace server shutdown WaitGroup with implementation based on combiner

Combiner already tracks the in-flight job count and queue size,
deferring shutdown until this count is zero is a cleaner approach than
duplicating behavior.