Merge "netd.c - nettrace - add support for icmp type/code & udplite/sctp ports." into main