MERGE: Add support for multiple forms of blacklist queries using matches

atheme/charybdis@3c93d380e0a829e22e50acd04b6f7672ee6908ce

It supports both literal and last octet matches from the dnsbl.
If matches is not present, the old behaviour is used.