Bug 5511/trigger policy update

A more conservative approche to that correction that does not modify code already in use and only add code where the bug lies. 

For Rudder 2.12, we will need to finish the refactoring, letting only the sequence.