Merge branch '5824-keep-web' into 5824-keep-web-workbench

Conflicts:
	services/keepproxy/keepproxy.go

diff --cc services/keepproxy/keepproxy.go
index bad0d22bf1a81868799d8a437860f941d6fbe770,79ed51eb0e00f57eb38d4a31251a87c2bc5e866c..2efc9cef5b46fb4c87385b8e799eb355897694f1
--- 1/services/keepproxy/keepproxy.go
--- 2/services/keepproxy/keepproxy.go
+++ b/services/keepproxy/keepproxy.go
@@@ -89,17 -102,9 +102,9 @@@ func main() 
                defer os.Remove(pidfile)
        }
  
-       arv, err := arvadosclient.MakeArvadosClient()
-       if err != nil {
-               log.Fatalf("setting up arvados client: %v", err)
-       }
-       kc, err := keepclient.MakeKeepClient(&arv)
-       if err != nil {
-               log.Fatalf("setting up keep client: %v", err)
-       }
        kc.Want_replicas = default_replicas
 -
        kc.Client.Timeout = time.Duration(timeout) * time.Second
 +      go RefreshServicesList(kc, 5*time.Minute, 3*time.Second)
  
        listener, err = net.Listen("tcp", listen)
        if err != nil {