Cleaned up confusing upgrade-sequence numbering

Signed-off-by: Yuri Weinstein <yuri.weinstein@inktank.com>
Merge pull request #216 from ceph/wip-cleanup-giant

Cleaned up confusing upgrade-sequence numbering