Cleaned up tests structure

Signed-off-by: Yuri Weinstein <yuri.weinstein@inktank.com>
Put mds after ods in restart

Signed-off-by: Yuri Weinstein <yuri.weinstein@inktank.com>
Merge pull request #217 from ceph/wip-9419

Cleaned up tests structure