second attempt at fixing MATH-484 This fixes bad behavior when several events occur during a long step This also fixes bad behavior when events are triggered during backward integration Jira: MATH-484