Fixes ZEN-11533
Merge pull request #14 from zenoss/feature/ZEN-11533

Fixes ZEN-11533