Merge branch '6199-deleting-spamfilter_users-should-delete-linked-spamfilter_wblist' into 'develop'

Resolve "deleting spamfilter_users should delete linked spamfilter_wblist"

Closes #6199

See merge request !1499