Merge "Wait for server termination in server affinity tests"