Fixes ZEN-15866
Merge pull request #302 from zenoss/feature/ZEN-15866

Fixes ZEN-15866