Update build-infra to master
Merge pull request #64 from ClearwaterCore/ccsto227

Update build-infra to master