show_timeouts, new default
Fix #15170 - keep comments within the hosts file
Fix esky builds when using setuptools
Fix missing args issue in mine.send

Resolves #15309

mine.send was not functional for any function which didn't contain
defined arguments.

This forcibly packs those into the function call if they aren't
detected. I'm not totally convinced this is the best way to do this, so
other approaches are welcome.
Turn down warning.

See discussion here:
https://github.com/cachedout/salt/commit/6fce06c6606c7caa079a82bcfb40083b94009ce0
Added instructions on how to back-port fixes to release branches
zfs doesn't support help as parameter. Changed with a question mark.
STY: Refactored common code in salt.module.pip to make it easier to maintain and simplify the code
Fix ZMQ warning

The logic in this warning message was incorrect, as it would warn if
there is no zmq_version_info attribute in pyzmq, but then knowingly say
in the comment that pyzmq 2.1.9 doesn't have this attribute.

This uses zmq.zmq_version_info() if present, and if not then falls back
to obtaining the version string from zmq.version_info() and building a
version info tuple out of the result.
Fix ZMQ warning

The logic in this warning message was incorrect, as it would warn if
there is no zmq_version_info attribute in pyzmq, but then knowingly say
in the comment that pyzmq 2.1.9 doesn't have this attribute.

This uses zmq.zmq_version_info() if present, and if not then falls back
to obtaining the version string from zmq.version_info() and building a
version info tuple out of the result.
BUG: Implemented consistent call to brew command in modules.brew using the admin user brew was installed with
Feature - Add support for node groups in the file tree external pillar module
Merge branch 'develop' of https://github.com/saltstack/salt into feature-ext_pillar-file_tree-nodegroups
Feature - Added dict merge function to merge node group and host pillar data instead of overwriting it
First pass at allowing jenkins.py to only run cloud tests
Remove 'is True'
Correct cloud_prep_sls reference
Small fixes in the comments in conf/minion
mount: add support for OpenBSD

Add support for missing functions that make sense on OpenBSD.
SmartOS esky: fix odd problem with zeromq linking