Minion restart if master is not responding
fix highstate output
Make sure to pack the __pillar__ into the renderers
Fix link to AWS credential distribution blog post

The existing link left me feeling confused and unfulfilled. I think that's possibly because it accidentally linked to the previous post in the series. I found the "correct" post by googling for it.
Merge pull request #12415 from pwaller/patch-1

Fix link to AWS credential distribution blog post
Merge pull request #12413 from jacksontj/job_cache

Make sure to pack the __pillar__ into the renderers
fix typo in runners.lxc.init() docstring
fix typo in states.dockerio.script() docstring
Merge branch 'fix_ddns2' of git://github.com/steverweber/salt into steverweber-fix_ddns2

Conflicts:
	salt/config.py
Merge branch 'steverweber-fix_ddns2' into develop
Clarified Salt Mine docs on how to pass arguments
Merge pull request #12411 from makinacorpus/ff2

fix highstate output
lots of copyediting
Merge pull request #12417 from cvrebert/patch-1

fix typo in runners.lxc.init() docstring
Merge pull request #12418 from cvrebert/patch-2

fix typo in states.dockerio.script() docstring
Merge pull request #12423 from whiteinge/doc-mine-args

Clarified Salt Mine docs on how to pass arguments
Merge pull request #12424 from hulu/copyediting

lots of copyediting
Add option to include Docker host ips

This will a a host dictionary with keys of ipv4 and ipv6.
This will be useful to include in some other functions
Merge pull request #12426 from UtahDave/develop

Add option to include Docker host ips
Saltify supports non-default ssh ports