Fixes ZEN-15434
Merge pull request #258 from zenoss/feature/ZEN-15434

Fixes ZEN-15434