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

Conflicts:
	services/keepproxy/keepproxy_test.go

diff --cc sdk/go/arvadosclient/arvadosclient_test.go
index d1487235dcf6f71033e7fb8232bf6a8955d84d35,f2fd0b1b334a3e3790e6bb8c39a60db8a335ad66..8e32efe4f987adccbe77b573a15ab27dbdfcc707
--- 1/sdk/go/arvadosclient/arvadosclient_test.go
--- 2/sdk/go/arvadosclient/arvadosclient_test.go
+++ b/sdk/go/arvadosclient/arvadosclient_test.go
@@@ -23,13 -26,9 +26,14 @@@ type ServerRequiredSuite struct{
  func (s *ServerRequiredSuite) SetUpSuite(c *C) {
        arvadostest.StartAPI()
        arvadostest.StartKeep(2, false)
+       RetryDelay = 0
  }
  
 +func (s *ServerRequiredSuite) TearDownSuite(c *C) {
 +      arvadostest.StopKeep(2)
 +      arvadostest.StopAPI()
 +}
 +
  func (s *ServerRequiredSuite) SetUpTest(c *C) {
        arvadostest.ResetEnv()
  }