Merge remote-tracking branch 'upstream/release-5.35' into collabora-5.35

2 jobs for deploys/test-20210615 in 9 minutes and 12 seconds (queued for 1 second)
latest
Status Job ID Name Coverage
  Test
failed #98836
allowed to fail
lint

00:07:40

passed #98837
test-quick

00:09:12

 
Name Stage Failure
failed
lint Test
store/storetest/team_store.go:1278:6: ineffectual assignment to nErr (ineffassign)
_, nErr := ss.Team().SaveMember(m1, 1)
^
web/handlers.go:145:3: ineffectual assignment to tmpSrv (ineffassign)
tmpSrv := app.Server{}
^
make: *** [Makefile:234: golangci-lint] Error 1
Cleaning up file based variables
ERROR: Job failed: exit code 1