Fixes #6189 - Rework activation key destroy with dynflow
Merge pull request #4302 from daviddavis/temp/20140618163727

Fixes #6189 - Rework activation key destroy with dynflow