bug 862017 - port windows clobber fixes to mozharness. r=jhopkins