Merge branch 'revert-ad49ebab' into 'master'

Revert "Merge branch 'update_aks_version' into 'master'"

See merge request !360
6 jobs for master in 1 minute and 31 seconds (queued for 1 second)