13111: Merge branch 'master' into 13111-webdav-projects

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

diff --cc sdk/go/arvados/fs_collection_test.go
Simple merge

diff --cc services/keep-web/webdav.go
index 3e62b19bbe296f35a514543121d3b29111133db1,432c6af6d89847068cfbc154a413ade33c5585dc..5b23c9c5fa9f10bffec55d48e6950fd0ac76d639
--- 1/services/keep-web/webdav.go
--- 2/services/keep-web/webdav.go
+++ b/services/keep-web/webdav.go
@@@ -47,10 -47,7 +47,10 @@@ type webdavFS struct 
  }
  
  func (fs *webdavFS) makeparents(name string) {
-       dir, name := path.Split(name)
 +      if !fs.writing {
 +              return
 +      }
+       dir, _ := path.Split(name)
        if dir == "" || dir == "/" {
                return
        }