saltstack/salt

Merge #43764 with a couple of doc updates
#48108

rallytime wants to merge rallytime:pr-43764 into saltstack:develop

Compare on GitHub

We do not currently have an analysis of these two commits