Test list of possible watchers
Return only users who can see the watchable
Fix callback reference
Merge pull request #2264 from opf/hotfix/17512_duplication_of_wp_with_invalid_watcher

Hotfix/17512 duplication of wp with invalid watcher
Merge branch 'release/4.0' into dev