Remove singleton
Merge branch 'pluggable_chaos_type' into simulate_ebs_failure