Fixes #6189 - Rework activation key destroy with dynflow

I updated Partha's PR.