Merge branch 'spamfilter-delete-fix' into 'stable-3.1'

Fixed deleting spamfilter users when deleting mail domain

Signed-off-by: Kristián Feldsam <feldsam@gmail.com>

See merge request !377