Fixes ZEN-11568
Merge pull request #273 from zenoss/feature/ZEN-11568

Fixes ZEN-11568