fix failing test from export_data change
Merge pull request #1967 from diox/search-api-tarako-categories

Handle special tarako categories in search (bug 998814)
Merge pull request #1963 from cesperanc/master

pt-PT localization
add categories to .po files.  Thanks Mathieu!
skip cache on content ratings api to catch pingback
tweak landfill reset sql
Removed settings.MARKETPLACE (bug 998519)
include pk and filepath in the collection export (bug 999598)
settings: remove settings_addons files
flip from zippy to boku
Removed most of apps/api/ (bug 999103)
Fixed AMO's api removal error in settings
Removed apps/blocklist/ (bug 999114)
Add country names to provider details (bug 996085)
Merge pull request #1952 from muffinresearch/add-countries-to-payment-providers

Add country names to provider details (bug 996085)
Merge pull request #1970 from mstriemer/reduce-app-data-in-collections-export-999598

include pk and filepath in the collection export (bug 999598)
Merge pull request #1974 from andymckay/turn-on-dev

flip from zippy to boku
Extract/compile script.  Today's lucky number is 22240.
Updated use of escape_all in reviewer tools manifest (bug 996609)
fix typo