Detect mixed content blocking by prefs, not FF version
Add merge-rulesets.py from master