Merge branch 'master' and update deckard

We need this to fix the tests.
3 jobs for policy-deny in 5 minutes and 43 seconds (queued for 2 seconds)
Status Job ID Name Coverage
  Build
passed build:linux:amd64 #6398
docker linux amd64

00:03:40

 
  Test
passed deckard:linux:amd64 #6400
docker linux amd64

00:02:02

passed test:linux:amd64 #6399
docker linux amd64

00:01:29