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

Fix d-f-x suite
Fixed git issues

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