Backport v2022<-v2023dev1: Append a suffix when incrementing a backported version

Backport !84 (merged)

A simple increment turns ~v2022 into ~v2023, which while sorting after ~v2022, makes no sense. Instead of blindly incrementing this suffix, append another one, +1, to ensure the per-release versioning works.