Wip 9729 master

@SandonV Pls review, merge and delete

This is to make dumpling-firefly-x suite the same on giant and master

RE:
https://github.com/ceph/ceph-qa-suite/pull/192
http://tracker.ceph.com/issues/9729

Signed-off-by: Yuri Weinstein yuri.weinstein@inktank.com