Merge "setlocalversion: Prevent tags from overflowing version string" into msm-3.0