ZEN-9979: ported from ZEN-10038
Merge pull request #251 from zenoss/feature/ZEN-9979

ZEN-9979: ported from ZEN-10038