Merge pull request #16257 from SmithSamuelM/2014.7_sam5

Updated consistent semantics for SaltEvent get_event factor