Be sure not to loose any var in case of multi macro inheritance
fixed linux nic name match

linux network interface name can have hyphen strings
Ensure `master_port` in minion config matches `ret_port` in master config if running a dev version of salt on non-default ports.
Unhandled exception in salt-run #9750
bug: syndic does not return in 1 seconds

if syndic not return in 1 seconds after master's minion returned, the raw will be None, so the syndic's minions return could not be display
blockdev state, module and test
add support to config azure management_host

Because china azure management_host isn't 'management.core.windows.net'.
minion connection timeout is too small

when network is slow (e.g. 3g connection), minions in multi-master mode fail
to connect: the timeout of 1sec expires before the connection can be
established.
add sequence filter for jinja
Allow salt cloud to start maintaining its own cachedir
Clarify docstring for pem_finger()
Merge pull request #10359 from techhat/cloudcache

Allow salt cloud to start maintaining its own cachedir
Update the footer to align with new .com site.
More dig tests
small lint fix
code cleanup
Merge pull request #10366 from rallytime/dig_test

More dig tests
Log 'zfs help' output at debug

This suppresses the output from this command unless the minion is
running in debug mode.
all methods in dig.py are tested
Merge pull request #10307 from makinacorpus/jinja_in

Be sure not to loose any var in case of multi macro inheritance