Merge "Begin collecting xtables iface counters." into jb-dev