Minion restart if master is not responding
fix highstate output
fix typo in runners.lxc.init() docstring
fix typo in states.dockerio.script() docstring
hopefully okay
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
Update mine on any changes to docker containers
Merge pull request #12433 from UtahDave/develop

Update mine on any changes to docker containers
Merge pull request #12430 from dnd/saltify_ssh_port

Saltify supports non-default ssh ports