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%"
Add maven to build script.
Add java develoment libs to vagrant box.

Update build script with correct default JAVA_HOME
Install Maven during build, if missing.

Clean up maven tarball in clean.sh
Remove maven after it has been unpacked.