ZEN-10859: ported from ZEN-10878
Merge pull request #288 from zenoss/feature/ZEN-10859

ZEN-10859: ported from ZEN-10878