Merge branch 'port-2021-06-30' into 'master'

Port 2021 06 30

See merge request !1
2 jobs for master in 2 minutes and 56 seconds (queued for 8 seconds)
Status Job ID Name Coverage
  Build
passed #1455
testing
build

00:01:47

 
  Test
failed #1456
testing
test

00:01:08

 
Name Stage Failure
failed
test Test
goroutine 350027 [running]:
gitlab.dms3.io/p2p/go-eventbus.panicOnTimeout(0x12a05f200)
/home/gitlab-runner/builds/XqNQ27jA/0/p2p/go-eventbus/basic_test.go:460 +0x65
created by gitlab.dms3.io/p2p/go-eventbus.TestSubFailFully
/home/gitlab-runner/builds/XqNQ27jA/0/p2p/go-eventbus/basic_test.go:475 +0x2b8
exit status 2
FAIL gitlab.dms3.io/p2p/go-eventbus 28.430s
Cleaning up file based variables
ERROR: Job failed: exit status 1