When reloading by-name watches, cancel old watches
Merge pull request #235 from sbt/wip/havocp-cancel-on-reload

When reloading by-name watches, cancel old watches