HPCC-11606 ecl-test no longer starting

Resolve merge problems

Signed-off-by: Attila Vamos <attila.vamos@gmail.com>