[CB-4149] Read version from VERSION when there is no .git/
Merge branch 'master' into ffos