Fix some mistakes from the merge forward

@jacksontj FYI this means that 06e9b02ac94274e2fc631e52094235c9ac8f8d4c and 036462592ad596458dbe54f11caf7a797ad98fb2 are not in develop. You should coordinate with @cachedout, who recently rewrote most of salt/utils/event.py, and see if those apply anymore.