ported from 4.2.4
Merge pull request #221 from zenoss/feature/ZEN-10524

ported from 4.2.4