Bug 1998860: watchlist_queue needs cleanup on usr/view/block delete

If one was to delete a usr/view/block that referenced in the
watchlist_queue then we get an error

Change-Id: I612ade99363625cbb4c8f85d9ed4c3c429c32efd
Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>