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