Revert "Revert "Add Adi's correct code block in fileclient.py back in, prevent s..."
Merge pull request #13964 from saltstack/revert-13954-revert-13951-master_tops_fix3

Revert "Revert "Add Adi's correct code block in fileclient.py back in, p...