working
Merge remote-tracking branch 'origin/wip_4510' into mine

Conflicts:
	teuthology/task/ceph_manager.py