Keep step in session data up-to-date.
Merge branch 'checkout_step_discovery' into develop
Handle exception when "order" isn't in session.
Merge branch 'checkout_step_discovery' into develop