Trigger name collision workaround

[mjtice]

This addresses the jinja trigger name collision noted in issue #4641

[CLAassistant]

All committers have signed the CLA.

[cognifloyd]

This looks like a good clean change.

@mjtice would you please sign the CLA #5335 (comment) ? It would be great to merge this sooner rather than later.

[mjtice]

This looks like a good clean change.

@mjtice would you please sign the CLA #5335 (comment) ? It would be great to merge this sooner rather than later.

Done.

[cognifloyd]

It looks like maintainer edits aren't allowed - and I don't think github allows that for forks in organizations.

So, let's see if we can get this ready to merge together. Please:

1. add a changelog entry
2. merge in master

I'm not sure why GHA tests haven't run for the last commit (only circleci ran? weird). I hope tests will run once you do that, if not I might need to pull in your commits another way.

[cognifloyd]

I just opened #5383 to include your changes. As soon as someone else approves it, we can get it merged.