Fixes ZEN-14424
Merge pull request #36 from zenoss/feature/ZEN-14424

Fixes ZEN-14424