Fixes ZEN-15014
Merge pull request #41 from zenoss/feature/ZEN-15014

Fixes ZEN-15014