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

[No review required] Take latest build-infra
Take latest build-infra to fix build
Merge pull request #3 from Metaswitch/sto519-fix-build

[No review required] Take latest build-infra to fix build