Synced up d-f-x and f-x suites with the latests from master

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

Signed-off-by: Yuri Weinstein <yuri.weinstein@inktank.com>
Removing files not in master

Signed-off-by: Sandon Van Ness <sandon@inktank.com>
Merge pull request #183 from ceph/update_upgrade_suits2

Update upgrade suits2