Improve version code calculation, implements #786

Version codes of releases (master builds) are now always higher than version codes of beta builds (feature branches).
This ensures we can always update the production release.