Fix #15170 - keep comments within the hosts file
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
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
Adding an additional CLI argument, ret_config, which can be used to
override configuration options passed to the returner.

Adding support for ret_config to all returners.

Adding _get_options to all returners that use configurable options.

Adding return_config support to the scheduler and scheduler related management module & state.
fixing lint issues.
more lint fixes.
Checkout that kwargs exists in clear_load before attempting to pull out a kwarg.
Merge branch 'develop' of https://github.com/saltstack/salt into feature-ext_pillar-file_tree-nodegroups
Fixed lint issue with newly added code
Add some virtualization detection for Windows hosts and some RHEV detection
modules.useradd.get_loginclass: avoid shadowing outer info() func

************* Module salt.modules.useradd
salt/modules/useradd.py:534: [W0621(redefined-outer-name), get_loginclass] Redefining name 'info' from outer scope (line 504)
TST: Updated brew module unit test to patch the appropriate __salt__ functions for the updates to brew module
Align highstate output
Use netstat on sunos: fixups

Make it DRYer, should no longer fail lint.
Hide `concurrent` arg for state.sls

This arg should almost never be used, so I don't think it should be
featured in the function signature.  It remains documented in the
docstring, but with a giant warning below it.
Document multiple file.managed sources