Fixes ZEN-13580
Merge pull request #288 from zenoss/feature/ZEN-13580

Fixes ZEN-13580