Prevent zips and md5s from accumulating in /tmp, and handle non-DHO users in make surgical

Change-Id: Ibe5ce2e5de259df5c8412a3fa260d5055d8aeb10