Merge branch 'port-2021-07-04'

2 jobs for master in 1 minute and 2 seconds (queued for 46 seconds)
Status Job ID Name Coverage
  Build
passed #2545
testing
build

00:00:24

 
  Test
failed #2546
testing
test

00:00:38

73.9%
 
Name Stage Failure
failed
test Test
$ go test -cover
--- FAIL: TestEarlyPublish (1.05s)
pubsub_test.go:152: [ValueStore 2] vssolve failed: routing: not found
FAIL
coverage: 73.9% of statements
exit status 1
FAIL gitlab.dms3.io/p2p/go-p2p-pubsub-router 17.214s
Cleaning up file based variables
ERROR: Job failed: exit status 1