Cleanup of tcp/ip & multicast join test
Merge pull request #3758 from pveentjer/cleanup/3.x/jointest-cleanup

Cleanup/3.x/jointest cleanup