Merge remote-tracking branch 'upstream/develop' into sam_raet_28
Merge pull request #11356 from SmithSamuelM/sam_raet_28

Clean up and refactoring
Don't cast the present minions in a list
Merge pull request #11354 from mgwilliams/lxc

salt.runners.lxc: bug and speedup
Merge pull request #11358 from whiteinge/presence-minion-set

Return empty set
Merge pull request #11351 from Jiaion/develop

Increase syndic_master_publish_port parameters . syndic config
lint fix
Start cleaning up all refs to use get_local_client
Added more compact but still readable ascii raet header format which is not the default over json header format
fixed class variable name .Did is not .Eid
Updated packeting tests to test new raet head format
Merge remote-tracking branch 'upstream/develop' into sam_raet_28
Merge pull request #11360 from SmithSamuelM/sam_raet_28

Added more compact but readable default head format raeting.headKinds.raet
Ensuring the order of options for tar, need to make sure -f is last and right before the filename
Add a quiet retcode wrapper for grain executions.

This fixes #11361 regression introduced by c341c0ebc4978ccdb75b22a1f2eec012b558980b.
avoid shadowing outer clone() func in modules.lxc.init()

************* Module salt.modules.lxc
salt/modules/lxc.py:227: [W0621(redefined-outer-name), init] Redefining name 'clone' from outer scope (line 355)
Added restart of redo timer on transmit so does not send any spurious redos
Merge pull request #11366 from SmithSamuelM/sam_raet_29

Added restart of redo timer on transmit so does not send any spurious redos
Merge pull request #11363 from makinacorpus/hfix2

Add a quiet retcode wrapper for grain executions.
added stats for redos
Merge remote-tracking branch 'upstream/develop' into develop
Merge pull request #11362 from garethgreenaway/develop

Ensuring the order of options for tar in the archive state.