Merge "First half of fix for bug #30332 ("API spamblocklist error should provide...