Merge branch 'bw_version_git_fix' into 'develop'

Fixing version git generation

See merge request !479

(cherry picked from commit ce89b984)

6c12ab0a Fixed problem in improper modification of git version string leading to...