CLC-1220 Tweak update-build to play nice with Git tags
Merge pull request #651 from ctweney/clc-1220-followup

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