TMDM-7835: Avoid "JobName error" pop up when overwrite generated progress/trigger deleted to recyclebin
Merge branch 'maintenance/5.6'