Fix working EDP jobs with non-string configs

Change-Id: I35435b56f588089b23b0e2f23c4cca9ce701f4af
Closes-bug: #1387723
Merge "Fix working EDP jobs with non-string configs"