upgrade/firefly: consolidate into a single collection

Signed-off-by: Sage Weil <sage@inktank.com>
suites/upgrade/firefly: test rgw at the end

...and do all final tests for all runs

Signed-off-by: Sage Weil <sage@redhat.com>