Use same upgrade-test as firefly.
The changes for firefly upgrade tests apply to giant as well.
Merge pull request #131 from ceph/wip-9357-wusui

Use same upgrade-test as firefly.