CURATOR-161

[Cameron McKenzie]

Guys,
If anyone's got a spare few minutes could they please review the final
changes to CURATOR-161. If we're happy with the implementation then I'll
merge into the 3.0 branch and then start work on getting the recipes to use
the watcher removal stuff.
cheers
Cam