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

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