Merge branch 'master' into 7490-datamanager-dont-die-return-error

Conflicts:
	services/datamanager/datamanager_test.go

diff --cc services/datamanager/datamanager_test.go
index 6ceb1e625eb3a458e056771e1de2307f15e3c529,685f94c88f3a35c33f6aa986e85701a5853e5d32..26a2fbf92ba124c8cbe4e534c39931107f084dca
--- 1/services/datamanager/datamanager_test.go
--- 2/services/datamanager/datamanager_test.go
+++ b/services/datamanager/datamanager_test.go
@@@ -33,11 -28,8 +28,12 @@@ func SetupDataManagerTest(t *testing.T
        arvadostest.StartAPI()
        arvadostest.StartKeep(2, false)
  
 -      arv = makeArvadosClient()
 +      var err error
 +      arv, err = makeArvadosClient()
 +      if err != nil {
 +              t.Fatalf("Error making arvados client: %s", err)
 +      }
+       arv.ApiToken = arvadostest.DataManagerToken
  
        // keep client
        keepClient = &keepclient.KeepClient{