bug fix and revert for version handling

* git version info extraction was buggy
* version handling was messed up by change of __version__ to __initversion__ (use __release__ instead!!)

Change-Id: Ibbf5953bf8759f94323f9d31bded2c3095ba58a0
Merge "bug fix and revert for version handling"