Merge "IpServerTest: add test addRemoveTetherClient"