Fixes ZEN-15540
Merge pull request #15 from zenoss/feature/ZEN-15540

Fixes ZEN-15540