A note about cherry-picking
Merge pull request #11881 from garethgreenaway/develop

Cleanup some code in the iptables module
Merge pull request #11878 from cachedout/minor_release

A note about cherry-picking
Adding the ability to retrieve per device stats from ps for network_io_counters and disk_io_counters.  Per feature request #11380