Merge changes I3fffbf4a,If557b0a1 into sc-dev

* changes:
  Improve dumping IPv4 map entries.
  Dump underlying BPF traffic stats as well as higher-level stats.