Bug 1055918 - mozharness mach desktop build fixes for nonunified, try upload, and check test, r=mgerva