Reviwer: Alex Hockey - ccstor44

The other half of the changes to go along with the changes to clearwater-build-infra.