Fix running EDP job on transient cluster

Change-Id: Iea182c10f958a4a0034c472a77e58711b4d4fa73
Closes-bug: #1307960
Merge "Fix running EDP job on transient cluster"