Changed upgrade order and re-enabled rados/tests.sh

Signed-off-by: Yuri Weinstein <yuri.weinstein@inktank.com>
Merge pull request #66 from ceph/wip_tune_upgrade-firefly

Changed upgrade order and re-enabled rados/tests.sh

Reviewed-by: Josh Durgin <josh.durgin@inktank.com>