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%