Fixes ZEN-15755
Merge pull request #48 from zenoss/feature/ZEN-15755

Fixes ZEN-15755