Fixes ZEN-14317
Merge pull request #253 from zenoss/feature/ZEN-14317

Fixes ZEN-14317