Merge topic 'variable_watch-modify-on-callback'

4c0edbd7 variable_watch: Made it safe to add/remove watches in access callbacks
28d2c6ef test: Added additional unit test to variable_watch

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1284