Refs #404 - Rename watcher in service and add a deprecation warning in case of people using service
Merge pull request #406 from Natim/issue-404

Refs #404 - Rename watcher in service