remove leading hypen from extraversion before adding one

Change-Id: Ia33f564d272cae14f300c18d783a108ad09dfef6
Merge remote-tracking branch 'cm/cm-10.1'