Fixes ZEN-15839
Merge pull request #301 from zenoss/feature/ZEN-15839

Fixes ZEN-15839