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

qa flavored version of same pull from #651