Merge pull request #14607 from lyft/boto_asg-resolve-error-tags-not-given

Resolve - https://github.com/saltstack/salt/issues/14604
Merge pull request #14627 from hvnsweeting/hvn-fix-rabbitmq-cluster

fix rabbitmq cluster document & function name
Merge pull request #14641 from zigarn/issue/14640

Fix `win_pkg.list_upgrades`
Merge pull request #14656 from kyriakosoikonomakos/timedelta

fix for issue #14655
Merge pull request #14682 from rasathus/develop

Added support for resilient elasticseach clusters via multiple hosts
Merge pull request #14683 from eliasp/2014.7-states.file.managed-check-defaults

Also validate 'defaults' in states.file.managed
Merge branch '2014.7' into develop
Add pepa.py external pillar from develop to 2014.7

Ref #14454
Ref #14522
Ref #14538
Ref #14545
Ref #14548
Ref #14592
Merge pull request #14688 from xzy3/develop

Fixed AttributeError in _threaded_return caused when execution modules yield dicts.
Merge branch '2014.7' into develop
Merge branch 'feature-glusterfs-add_bricks' of https://github.com/Setsuna666/salt into Setsuna666-feature-glusterfs-add_bricks
lint in module
lint in state
Merge branch 'Setsuna666-feature-glusterfs-add_bricks' into develop
Merge pull request #14701 from lyft/asg-support-security-group-names

boto_asg - add support for use of security group names in launch configs
Merge pull request #14704 from Learnosity/2014.7

Add force_reset option to git.latest; fixes #10414
Merge branch 'develop' of github.com:saltstack/salt into develop
Merge pull request #14711 from thatch45/develop

Merge #14696 with lint fixes
Merge branch 'develop' of github.com:saltstack/salt into develop
Merge pull request #14705 from NicholasTD07/add_newline_values_only

Add newline_values_only and flaten output methods.