CLC-1220 Tweak update-build to play nice with Git tags

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