EPE-22 Use new ECL Watch if available

Fixes EPE-22

Signed-off-by: Gordon Smith <gordon.smith@lexisnexis.com>