Fixes ZEN-15495
Merge pull request #266 from zenoss/feature/ZEN-15495

Fixes ZEN-15495