Fix packager to not add commit hash when creating a tagged version

Was adding -0-HASH to version when we just want the tag.
Change build stamp again by having it use only VERSION file on master branch

This will have it show "3.2.0-dev-HASH" on master even though there is
no "3.2.0-dev" git tag.