Solve conflicts for "Job Trace polling solution "

What does this MR do?

This addresses the conflicts from !49982 (merged) to allow the preparation branch 13-7-stable-ee-patch-3 to be deployed

Screenshots (strongly suggested)

N/A

Does this MR meet the acceptance criteria?

Conformity

• [-] Changelog entry
• [-] Documentation (if required)
• Code review guidelines
• Merge request performance guidelines
• Style guides
• [-] Database guides
• [-] Separation of EE specific content