ZEN-13008: ported from ZEN-13018
Merge pull request #27 from zenoss/feature/ZEN-13008

ZEN-13008: ported from ZEN-13018