[CLC-1224] Update-build script fixes

JIRA: https://jira.media.berkeley.edu/jira/browse/CLC-1224