HPCC-11606 ecl-test no longer starting

Resolve merge problems

Signed-off-by: Attila Vamos <attila.vamos@gmail.com>
Merge pull request #6006 from AttilaVamos/HPCC-11606-fix

HPCC-11606 ecl-test no longer starting

Reviewed-by: Gavin Halliday <ghalliday@hpccsystems.com>