Merge branch 'master' into aho-corasick

... to resolve some simple conflicts.
12 jobs for aho-corasick in 16 minutes and 59 seconds (queued for 17 seconds)
Status Job ID Name Coverage
  Build
failed #74244
amd64 linux docker
build:linux:amd64

00:03:27

canceled #73210
amd64 linux docker
build:linux:amd64

passed #35777
docker linux amd64
build:linux:amd64

00:01:13

canceled #72851
amd64 linux docker
build:linux:amd64

failed #73306
amd64 linux docker
build:linux:amd64

00:00:48

 
  Test
failed #73398
amd64 linux docker
deckard:linux:amd64

00:10:53

passed #35780
docker linux amd64
respdiff:linux:amd64

00:02:22

passed #35789
amd64 linux docker
test:linux:amd64

00:00:15

passed #35779
docker linux amd64
deckard:linux:amd64

00:01:01

canceled #73126
amd64 linux docker
deckard:linux:amd64

canceled #73294
amd64 linux docker
deckard:linux:amd64

failed #35778
docker linux amd64
test:linux:amd64

00:00:23

 
Name Stage Failure
failed
deckard:linux:amd64 Test There is an unknown failure, please try again
make[1]: *** [sets/resolver/world_cz_turris_api.out] Error 1
Makefile:48: recipe for target 'sets/resolver/world_cz_turris_api.out' failed
make[1]: *** [sets/resolver/world_cz_vutbr_www.out] Error 1
make[1]: Target 'all' not remade because of errors.
Makefile:48: recipe for target 'sets/resolver/world_cz_vutbr_www.out' failed
make[1]: Leaving directory '/builds/knot/knot-resolver/tests/deckard'
tests/tests.mk:27: recipe for target 'check-integration' failed
make: *** [check-integration] Error 2
ERROR: Job failed: exit code 1
failed
build:linux:amd64 Build There is an unknown failure, please try again
Removing modules/redis/redis.so
Removing modules/stats/stats.d
Removing modules/stats/stats.o
Removing modules/stats/stats.so
Removing modules/version/version.lua
HEAD is now at efd2968 lib/resolve: optimazlization of resolution overall time checking
Checking out bd7891e9 as aho-corasick...
Skipping Git submodules setup
ERROR: Job failed (system failure): Cannot connect to the Docker daemon at unix:///var/run/docker.sock. Is the docker daemon running?