Merge branch 'container_upgrade' into 'master'

Container upgrade + logging tweaks

See merge request !185
11 jobs for master
in 2 minutes and 42 seconds and was queued for 7 seconds