show_timeouts, new default
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
SmartOS esky: fix odd problem with zeromq linking
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
Merge pull request #15423 from nshalman/2014.7-zeromq-linking-breakage

SmartOS esky: fix odd problem with zeromq linking
modules.mount.swaps: avoid shadowing `type` built-in
utils.network.remotes_on_remote_tcp_port: Use comment instead of string literal

************* Module salt.utils.network
salt/utils/network.py:1022: [W0105(pointless-string-statement), remotes_on_remote_tcp_port] String statement has no effect
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