fix TESB-12483 (backport from job-controller)