Merge 17588 with pylint fixes

There will be some pylint errors in `salt/utils/minions.py` and `salt/minion.py` that were fixed with #17698.