fixes ZEN-11030
Merge pull request #247 from zenoss/feature/ZEN-11030

fixes ZEN-11030