Strip in all cases the original ver suffix before adding the new one

The option set-version-suffix was previously stripping away the
"-SNAPSHOT" suffix, if present; however, a different suffix like
"-RC2" or "-M1" was incorrectly retained.

The original suffix is now stripped away in all cases, before
adding the new one selected using set-version-suffix.