Remove code that shouldn't have been merged forward to develop
Revert bad merge forward of salt/utils/event.py
Merge pull request #19095 from basepi/pylint-merge-forward

Fix some mistakes from the merge forward