CP-10236: Add watch for data/ts

Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
Merge pull request #157 from cheng--zhang/CP-10236

CP-10236: Add watch for data/ts