Fixes ZEN-15460
Merge pull request #257 from zenoss/feature/ZEN-15460

Fixes ZEN-15460