Merge branch 'beat-support' into 'master'

Add support for packages required to run linux builds on docker-build hosts

See merge request !20