Make cram tests work with automatic gofmt git filter

Need to gofmt the source we care about so the line numbers match
whether there's a filter or not.
Fix temp cleanup error reporting

Used to overwrite the primary error with cleanup errors.

Used to report cleanup errors using the error message from the primary
error.

If there's both a primary error and a cleanup error, just log the
cleanup error and let the primary error be the real thing.