Merge "Remove dead code in mcast_join_leave"