Merge branch 'general_fixes' into 'master'

Fix for issues preventing cluster bootstrap

See merge request !145
6 jobs for master in 7 minutes and 19 seconds (queued for 2 seconds)