Finishing up edit_conf() in lxc
Need to add new items to the conf file too
Remove SaltNova.list_nodes fixes #11128

Turns out this function isn't used anywhere.
Removed ssh_key_name an internal test leftover
salt.utils.serializers package missing from setup.py
Merge pull request #11871 from DockerNAS/develop

salt.utils.serializers package missing from setup.py
Delete references to imported pip module so `reload(site)` works.

When an older `pip` library is installed on the system, even if on a
state we upgrade it and reload modules, since we we're not removing all
references, the new module is not loaded and the old one is still used
instead.

Alternatively we could try and find out which modules were imported by a
module and explicitly remove them from `sys.modules` thus forcing a
reload, however, this can also cause bad behaviours, what if we
explicitly unload `salt`?

For now this works and it's simple.
Merge pull request #11872 from s0undt3ch/hotfix/pip-reload

Delete references to imported pip module so `reload(site)` works.
Merge pull request #11869 from jeroennijhof/develop

Removed ssh_key_name an internal test leftover
Support older ZMQ versions.
Merge pull request #11875 from s0undt3ch/develop

Support older ZMQ versions.
Use same linger value
Merge pull request #11876 from s0undt3ch/develop

Use same linger value
Allow edit_conf() to be used to create new files too
A note about cherry-picking
Cleanup some code in the iptables module.  Inside build_rule for the dports & sports code, if dorts & sports are a list then use a join instead of the for loop to build the list of ports.
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
add c3 series
Adding the ability to retrieve per device stats from ps for network_io_counters and disk_io_counters.  Per feature request #11380