shell: move StopWait class; modifications to SessionManager: key as pair<ADR,PORT>