fix tunnelserver

Closes-Bug: #1396443
Change-Id: Ib1d06c204b025b6444b39e95f60cf7e94a9ee42f