Made versiontag optional
Merge pull request #6007 from topfs2/helix_versiontag

Helix versiontag
Merge branch 'Helix' of https://github.com/xbmc/xbmc into Helix