Merge pull request #175 from ceph/fix_d-f-x_suite

Fixed git issues
Fixed upgrade steps flow

Signed-off-by: Yuri Weinstein <yuri.weinstein@inktank.com>