Fixes ZEN-11511
Merge pull request #249 from zenoss/feature/ZEN-11511

Fixes ZEN-11511