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