Removing and adding watches while saving

This allows removal of the true/false guards for the watcher while
saving.

Signed-off-by: Sergio Schvezov <sergio.schvezov@canonical.com>
Merge pull request #1663 from sergiusens/master

Removing and adding watches while saving