Fixes ZEN-15617
Merge pull request #16 from zenoss/feature/ZEN-15617

Fixes ZEN-15617