issue: 425607 making usre that there are no msgs in flight before closing serversession

Change-Id: I1a1f5e1e87ba8f8511143ca82e74586e10693638