wip-rbd-rm-watchers

A fix for ticket 7076 + a related error path fix.