Fix device corruption on retried model txns.

Fixes ZEN-14590.
Merge pull request #14 from zenoss/feature/ZEN-14590

Please review branch feature/ZEN-14590