Merge pull request #15339 from whiteinge/doc-back-ports

Added instructions on how to back-port fixes to release branches
Merge pull request #15362 from hulu/cache-tests

caches.fs{cache,worker}: put main code into funcs to avoid shadowing
Merge pull request #15364 from terminalmage/fix-zmq-warning-2014.7

Fix ZMQ warning (2014.7 branch)
Merge pull request #15382 from felskrone/minions_connected_cache

Minions connected cache
Merge pull request #15385 from ajacoutot/obsd-loginclass

Implement user login class on OpenBSD.
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 pull request #15394 from mkotzev/develop

Modified `docker.absent` to remove the container after stopping it.
Merge pull request #15403 from ajacoutot/obsd-rcctl

openbsd_rcctl: improve performance of available() and missing()
Merge pull request #15404 from rallytime/cloud_nightly_tests

First pass at allowing jenkins.py to only run cloud tests
Merge pull request #15408 from sylphid8/target_pillar_from_ext_pillar

add ability to target pillar from ext pillar
Merge pull request #15412 from ajacoutot/obsd-shadow-exp

bsd_shadow: implement account and password expiration
Merge branch 'develop' of https://github.com/saltstack/salt into feature-ext_pillar-file_tree-nodegroups
Fixed lint issue with newly added code
Merge branch '2014.7' into develop

Conflicts:
	conf/minion
	salt/modules/mine.py
Merge branch 'obsd-mount' of https://github.com/ajacoutot/salt into ajacoutot-obsd-mount
Fix lint for #15419
Merge pull request #15431 from thatch45/ajacoutot-obsd-mount

merge #15419