fix devhub regressions (bugs 847326, 847296, 847317)

Fixes a couple of regressions from changes or missing deps following 82f65dc

https://bugzilla.mozilla.org/show_bug.cgi?id=847326
https://bugzilla.mozilla.org/show_bug.cgi?id=847296
https://bugzilla.mozilla.org/show_bug.cgi?id=847317