[master] Porting #51840 to master

[garethgreenaway]

Porting #51840 to master

[codecov]

Codecov Report

Merging #54679 into master will increase coverage by 21.7%.
The diff coverage is 28.57%.

@@            Coverage Diff             @@
##           master   #54679      +/-   ##
==========================================
+ Coverage   15.07%   36.78%   +21.7%     
==========================================
  Files        1577     1578       +1     
  Lines      270239   270274      +35     
  Branches    57591    56208    -1383     
==========================================
+ Hits        40744    99413   +58669     
+ Misses     225624   159462   -66162     
- Partials     3871    11399    +7528

Flag	Coverage Δ
#archlts	?
#centos7	?
#debian8	?
#py2	36.78% <28.57%> (+23.39%)	⬆️
#py3	?
#tcp	36.78% <28.57%> (?)
#ubuntu1604	36.78% <28.57%> (+31.76%)	⬆️
#zeromq	?

Impacted Files	Coverage Δ
salt/roster/sshknownhosts.py	28.57% <28.57%> (ø)
salt/proxy/dummy.py	0% <0%> (-80.87%)	⬇️
salt/proxy/docker.py	0% <0%> (-62.5%)	⬇️
salt/proxy/chronos.py	0% <0%> (-50%)	⬇️
salt/proxy/marathon.py	0% <0%> (-50%)	⬇️
salt/transport/frame.py	30.3% <0%> (-46.97%)	⬇️
salt/proxy/cisconso.py	0% <0%> (-46.43%)	⬇️
salt/proxy/arista_pyeapi.py	0% <0%> (-45.66%)	⬇️
salt/proxy/nxos_api.py	0% <0%> (-44.74%)	⬇️
salt/utils/openstack/pyrax/authenticate.py	0% <0%> (-41.67%)	⬇️
... and 1194 more

---

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update e2b86bf...56a8588. Read the comment docs.

[dwoz]

@team-core the test failures, docs, and lint all look legit

[dwoz]

Black needs to be run on this.

[Ch3LL]

this needs a changelog