Make sure watch identifiers are unique

Signed-off-by: Paul Durrant <paul.durrant@citrix.com>