Land updates from apertis/v2020-updates

Merge the v2020-updates branch to enable the backported tests in the LAVA runs, as the LAVA machinery only looks at the apertis/v2020 branch.

While we should never land changes to apertis/v2020 except when folding updates when releasing a point release, this is purely a test package so it should not cause issues.