Merge branch 'Rel17_28.623_Cleanup_of_TraceJob' into 'Integration_Rel17_SA5_156_YAML'

Rel17 TS28.623 CR0396 Cleanup of TraceJob Update TS28623_GenericNrm.yaml

See merge request !1336