Update to match new/fixed AbuseFilter code

AbuseFilter patch: https://gerrit.wikimedia.org/r/#/c/32219/

Change-Id: I98ad0c529f7fd695c8958cbfe723c164b3081775
Merge "Update to match new/fixed AbuseFilter code"