Merge branch 'contrib-fix-docker-exitcode' into 'master'

contrib/*: minor fixes and container update

See merge request !43
5 jobs for master
in 1 minute and 5 seconds and was queued for 7 seconds