Always give saltenv argument highest priority
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'.
Spelling and typos.
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.
Fix references to masterapi in daemons.ioflo.master

************* Module salt.daemons.ioflo.master
salt/daemons/ioflo/master.py:63: [E1101(no-member), RemoteMaster.postioinit] Module 'salt' has no 'masterapi' member
salt/daemons/ioflo/master.py:96: [E1101(no-member), LocalMaster.postioinit] Module 'salt' has no 'masterapi' member
auth.pki.auth(): fix caps in ref to Crypto.Util

************* Module salt.auth.pki
salt/auth/pki.py:91: [E1101(no-member), auth] Module 'Crypto' has no 'util' member
lxc module: use spaces, not tabs
More tests on dig.py and found a bug in check_ip function (ipv6 regex)
Merge pull request #10355 from mgwilliams/lxc

lxc module: use spaces, not tabs
Merge pull request #10354 from cvrebert/patch-2

auth.pki.auth(): fix caps in ref to Crypto.Util
remove print statements
Merge pull request #10357 from rallytime/dig_test

Wrote more Dig tests
Merge pull request #10356 from SmithSamuelM/sam_raet_1

Sam raet 1
Merge pull request #10353 from cvrebert/patch-1

Fix references to masterapi in daemons.ioflo.master