Upgrade selection increments minor version by 1
Merge pull request #590 from wallyworld/next-upgrade-version-trunk

Upgrade selection increments minor version by 1

Forward port from 1.20.

Fixes: https://bugs.launchpad.net/bugs/1359435