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

Fixes ZEN-15755