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

Update build-infra to master