ZEN-12689: ported from ZEN-13214
Merge pull request #265 from zenoss/feature/ZEN-12689

ZEN-12689: ported from ZEN-13214