Port https://github.com/saltstack/salt/pull/50545 to master

[meaksh]

Port waiting for review: saltstack/salt#55237

[dincamihai]

Mention: https://github.com/SUSE/spacewalk/issues/10017

[meaksh]

@dincamihai - I'm unassigning you from this card just in order to allow other people to tackle this one if they want.

Of course, in case you still want to keep this, please reassign yourself :-)

Btw!! I hope you had a nice Christmas and Happy new year!! 😄

[vzhestkov]

Can be closed as saltstack/salt#60228 was merged