Update version number handling

Use build number defined by build environment when present