Take latest build-infra
Merge pull request #42 from Metaswitch/sto519-update-build-infra

[No review required] Take latest build-infra
Take latest build-infra (fix build)
Merge pull request #43 from Metaswitch/sto519-fix-build

Take latest build-infra (fix build)