Fixed: Removing watcher does not work on ticket merge (bug#10728).

Conflicts:
	CHANGES.md