Update downloader for new buildbot targets
More adjustments for buildbot changes. Mostly untested since no tests have passed yet.