Fix salt-ssh tests with newer Python#68757

marmarek wants to merge 3 commits intosaltstack:3007.xsaltstack/salt:3007.xfrom

marmarek:import-conflict-testsmarmarek/salt:import-conflict-testsCopy head branch name to clipboard