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

@jdurgin 

Pls review and merge

Signed-off-by: Yuri Weinstein <yuri.weinstein@inktank.com>