Merge #2136
2136: Add addon filter objects r=uhlissuh a=uhlissuh
fixes #2104
So, splitting these into two filter objects came from Rehan, which I thought was a good idea. He mentioned seeing about having them share some code, because there is duplication here, and I kinda looked at that for a while and arrived at wondering if we will really gain much here trying to have these two share code? There's only two that are shaped like this right now. There isn't a clear thing I could pull out, maybe someone sees something. Perhaps that's an argument for making them one filter?
Co-authored-by: Alissa Sobo <alissasobo@gmail.com>
