Fixes ZEN-12565
Merge pull request #214 from zenoss/feature/ZEN-12565

Fixes ZEN-12565