Merge "Fix account deletion when removing security policies." into ub-mail-master