Added delete-server-on-bootstrap-fail option