Honor expression context when creating Watches #1743

Job	Run time
check-freeze-period / verify-freeze-period	5s
check-merge-commits / Block Merge Commits	14s
check-versions / Check and increment service versions	2m 15s
	2m 34s

Provide feedback