Fixes ZEN-15593
Merge pull request #269 from zenoss/feature/ZEN-15593

Fixes ZEN-15593