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

Port 2021 06 30

See merge request !1
2 jobs for master in 30 seconds (queued for 14 seconds)
Status Job ID Name Coverage
  Build
failed #1425
testing
build

00:00:30

 
  Test
skipped #1426
testing
test
 
Name Stage Failure
failed
build Build
soft link /home/gitlab-runner/builds/XqNQ27jA/0/p2p/go-p2p-testing exists
$ else
$ cd $CI_PROJECT_DIR
$ echo $CI_JOB_STAGE
build
$ go build
no Go files in /home/gitlab-runner/builds/XqNQ27jA/0/p2p/go-p2p-testing
Cleaning up file based variables
ERROR: Job failed: exit status 1