Tcp-ip/multicast join cleanup and enhancements

Fixes #3058