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