[master] Porting #52710 to master

[garethgreenaway]

Porting #52710 to master

[codecov]

Codecov Report

Merging #54665 into master will increase coverage by 2.57%.
The diff coverage is 12.5%.

@@             Coverage Diff             @@
##           master   #54665       +/-   ##
===========================================
+ Coverage   15.07%   17.65%    +2.57%     
===========================================
  Files        1577      612      -965     
  Lines      270239    99408   -170831     
  Branches    57591    22775    -34816     
===========================================
- Hits        40744    17548    -23196     
+ Misses     225624    79709   -145915     
+ Partials     3871     2151     -1720

Flag	Coverage Δ
#archlts	?
#centos7	?
#debian8	?
#py2	?
#py3	17.65% <12.5%> (+4.43%)	⬆️
#ubuntu1604	?
#windows2016	17.65% <12.5%> (?)
#zeromq	17.65% <12.5%> (+4.12%)	⬆️

Impacted Files	Coverage Δ
salt/states/grains.py	5.78% <12.5%> (+5.78%)	⬆️
salt/executors/__init__.py	0% <0%> (-100%)	⬇️
salt/renderers/__init__.py	0% <0%> (-100%)	⬇️
salt/tops/__init__.py	0% <0%> (-100%)	⬇️
salt/sdb/__init__.py	0% <0%> (-100%)	⬇️
salt/tokens/__init__.py	0% <0%> (-100%)	⬇️
salt/utils/aws.py	0% <0%> (-43.22%)	⬇️
salt/utils/openstack/pyrax/authenticate.py	0% <0%> (-41.67%)	⬇️
salt/utils/xmlutil.py	13.63% <0%> (-40.91%)	⬇️
salt/utils/smb.py	19.83% <0%> (-39.68%)	⬇️
... and 1460 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...e7d62f9. Read the comment docs.

[codecov]

Codecov Report

Merging #54665 into master will increase coverage by 2.57%.
The diff coverage is 12.5%.

@@             Coverage Diff             @@
##           master   #54665       +/-   ##
===========================================
+ Coverage   15.07%   17.65%    +2.57%     
===========================================
  Files        1577      612      -965     
  Lines      270239    99408   -170831     
  Branches    57591    22775    -34816     
===========================================
- Hits        40744    17548    -23196     
+ Misses     225624    79709   -145915     
+ Partials     3871     2151     -1720

Flag	Coverage Δ
#archlts	?
#centos7	?
#debian8	?
#py2	?
#py3	17.65% <12.5%> (+4.43%)	⬆️
#ubuntu1604	?
#windows2016	17.65% <12.5%> (?)
#zeromq	17.65% <12.5%> (+4.12%)	⬆️

Impacted Files	Coverage Δ
salt/states/grains.py	5.78% <12.5%> (+5.78%)	⬆️
salt/executors/__init__.py	0% <0%> (-100%)	⬇️
salt/renderers/__init__.py	0% <0%> (-100%)	⬇️
salt/tops/__init__.py	0% <0%> (-100%)	⬇️
salt/sdb/__init__.py	0% <0%> (-100%)	⬇️
salt/tokens/__init__.py	0% <0%> (-100%)	⬇️
salt/utils/aws.py	0% <0%> (-43.22%)	⬇️
salt/utils/openstack/pyrax/authenticate.py	0% <0%> (-41.67%)	⬇️
salt/utils/xmlutil.py	13.63% <0%> (-40.91%)	⬇️
salt/utils/smb.py	19.83% <0%> (-39.68%)	⬇️
... and 1460 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...e7d62f9. Read the comment docs.