Honor expression context when creating Watches #2337

Job	Run time
check-merge-commits / Block Merge Commits	10s
check-freeze-period / verify-freeze-period	4s
check-versions / Check and increment service versions	3m 58s
	4m 12s

Provide feedback