Merge branch 'knot-3-dev' into 'master'

tweak conditionals to work with knot 3.0.dev

See merge request !885
12 jobs for master
in 71 minutes and 14 seconds and was queued for 4 seconds
Scheduled