Actually use the ChaosType we chose

Whoops ... pains of doing a manual merge!
Merge branch 'pluggable_chaos_type' into simulate_ebs_failure
Merge branch 'simulate_ebs_failure'