Merge changes Ic69fc75e,I6373d251 into main

* changes:
  Add ICMP type/code and udplite/sctp in Nettrace.
  Make BundleKey a distinct struct from PacketTrace.