fixes bug 1051984 - Use ujson to serialize JSON
dependency on whitespace in e2e test
Merge pull request #2282 from peterbe/bug-1051984-use-ujson-to-serialize-json

fixes bug 1051984 - Use ujson to serialize JSON
fix bug 1030840 - use new ADI data source in matviews
Merge pull request #2279 from rhelmer/bug1030840-switch-to-raw-adi

fix bug 1030840 - use new ADI data source in matviews
fix bug 1036559 - pull BAMO as well as AMO pings
Merge pull request #2287 from rhelmer/bug1036559-pull-from-bamo-and-amo

fix bug 1036559 - pull BAMO as well as AMO pings
Fixes bug 1046188 - Fixed multiple values handling in Super Search Field manage page. r=peterbe
fix bug 1053632 - collapse all release channels in fetch-adi-from-hive
fix bug 1037855 - special-case webapprt since the product_guid comes in without {}
Merge pull request #2289 from rhelmer/bug1053632-collapse-release-channels

fix bug 1053632 - collapse all release channels in fetch-adi-from-hive
fix bug 1054078 - match Mac OS X on Darwin%
fix ordering issue in unrelated test
Merge pull request #2291 from rhelmer/bug1054078-match-darwin-to-mac-os-x

fix bug 1054078 - match Mac OS X on Darwin%
Revert "fix bug 1054078 - match Mac OS X on Darwin%"
Merge pull request #2293 from mozilla/revert-2291-bug1054078-match-darwin-to-mac-os-x

Revert "fix bug 1054078 - match Mac OS X on Darwin%"
fix bug 1054587 - Clean up after fetch adi test

The raw_adi table did not get cleaned up after the tests were run.
Merge pull request #2296 from bramwelt/fix-fetch-adi-from-hive-test

fix bug 1054587 - Clean up after fetch adi test
followup from bug 1037855 - this introduced an intermittent test
failure, specify ORDER BY to make results consistent
Merge pull request #2299 from rhelmer/nobug-intermittent-test-failure

followup from bug 1037855 - this introduced an intermittent test