ported from 4.x
Merge pull request #22 from zenoss/feature/ZEN-9814

ported from 4.x