Fix upgrading edge-ish case
Merge pull request #45 from ceph/wip-6084

Fix upgrading edge-ish case