Join the TcpListener thread in case of a stopWait signal Change-Id: Ic336c46c9ceecdf4fe52c3c4198f5c6b158ac7f8