Merge branch '15044-test-fixes'

closes #15044

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg@veritasgenetics.com>

diff --combined services/keepproxy/keepproxy.go
index 0cb93ffb3182803aa3a4ea3094cf68f15ff1ef8a,caeaa0e2c5ba9104028981a738dea020307783ea..c6fd99b9d8ed2f70b264b342ed041d5062eeb0a8
--- 1/services/keepproxy/keepproxy.go
--- 2/services/keepproxy/keepproxy.go
+++ b/services/keepproxy/keepproxy.go
@@@ -152,7 -152,7 +152,7 @@@ func main() 
                }
                err = f.Sync()
                if err != nil {
-                       log.Fatal("sync(%s): %s", cfg.PIDFile, err)
+                       log.Fatalf("sync(%s): %s", cfg.PIDFile, err)
                }
        }
  
@@@ -541,7 -541,7 +541,7 @@@ func (h *proxyHandler) Put(resp http.Re
        if locatorIn == "" {
                bytes, err2 := ioutil.ReadAll(req.Body)
                if err2 != nil {
 -                      _ = errors.New(fmt.Sprintf("Error reading request body: %s", err2))
 +                      err = fmt.Errorf("Error reading request body: %s", err2)
                        status = http.StatusInternalServerError
                        return
                }