master
Merge branch '3007.x' into merge/3007.x/3008.x/25-05-26
Add back accidentially deleted pkg sub-dir.
Merge branch '3006.x' into 3007.x
Use KillMode=mixed in salt-minion.service unit
Fix salt zsh completion