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

Was adding -0-HASH to version when we just want the tag.
(cherry picked from commit 606ff75941f6ec4bbec745e1489aa840bb8ed885)
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.
(cherry picked from commit 8e5a2e730da70b8a8f597c7fba9bc328e0d89546)